From d55ade03fef6053389e9646463eecdebede3ea7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Mon, 6 Sep 2021 20:00:16 +0200
Subject: [PATCH] Copy qemu-specific config into isos-qemu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 .../portage/isos-qemu/env/releng/forcelfs     |  2 +
 .../portage/isos-qemu/env/releng/nosandbox    |  1 +
 releases/portage/isos-qemu/env/releng/qemu    |  1 +
 .../portage/isos-qemu/package.env/releng/all  |  1 +
 .../isos-qemu/package.env/releng/forcelfs     |  1 +
 .../isos-qemu/package.env/releng/glibc        |  1 +
 .../portage/isos-qemu/package.use/libpcre     |  5 +++
 releases/portage/isos-qemu/package.use/no-asm |  1 +
 .../compileall-singlethreaded.patch           | 41 +++++++++++++++++++
 .../compileall-singlethreaded.patch           | 41 +++++++++++++++++++
 .../compileall-singlethreaded.patch           | 41 +++++++++++++++++++
 11 files changed, 136 insertions(+)
 create mode 100644 releases/portage/isos-qemu/env/releng/forcelfs
 create mode 100644 releases/portage/isos-qemu/env/releng/nosandbox
 create mode 100644 releases/portage/isos-qemu/env/releng/qemu
 create mode 100644 releases/portage/isos-qemu/package.env/releng/all
 create mode 100644 releases/portage/isos-qemu/package.env/releng/forcelfs
 create mode 100644 releases/portage/isos-qemu/package.env/releng/glibc
 create mode 100644 releases/portage/isos-qemu/package.use/libpcre
 create mode 100644 releases/portage/isos-qemu/package.use/no-asm
 create mode 100644 releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch
 create mode 100644 releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch
 create mode 100644 releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch

diff --git a/releases/portage/isos-qemu/env/releng/forcelfs b/releases/portage/isos-qemu/env/releng/forcelfs
new file mode 100644
index 00000000..398e2b71
--- /dev/null
+++ b/releases/portage/isos-qemu/env/releng/forcelfs
@@ -0,0 +1,2 @@
+CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
diff --git a/releases/portage/isos-qemu/env/releng/nosandbox b/releases/portage/isos-qemu/env/releng/nosandbox
new file mode 100644
index 00000000..7a02010b
--- /dev/null
+++ b/releases/portage/isos-qemu/env/releng/nosandbox
@@ -0,0 +1 @@
+FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox -sandbox -usersandbox"
diff --git a/releases/portage/isos-qemu/env/releng/qemu b/releases/portage/isos-qemu/env/releng/qemu
new file mode 100644
index 00000000..de86517d
--- /dev/null
+++ b/releases/portage/isos-qemu/env/releng/qemu
@@ -0,0 +1 @@
+FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
diff --git a/releases/portage/isos-qemu/package.env/releng/all b/releases/portage/isos-qemu/package.env/releng/all
new file mode 100644
index 00000000..60c290a8
--- /dev/null
+++ b/releases/portage/isos-qemu/package.env/releng/all
@@ -0,0 +1 @@
+*/* releng/qemu
diff --git a/releases/portage/isos-qemu/package.env/releng/forcelfs b/releases/portage/isos-qemu/package.env/releng/forcelfs
new file mode 100644
index 00000000..7e1943c6
--- /dev/null
+++ b/releases/portage/isos-qemu/package.env/releng/forcelfs
@@ -0,0 +1 @@
+dev-util/cmake releng/forcelfs
diff --git a/releases/portage/isos-qemu/package.env/releng/glibc b/releases/portage/isos-qemu/package.env/releng/glibc
new file mode 100644
index 00000000..bf1f6f93
--- /dev/null
+++ b/releases/portage/isos-qemu/package.env/releng/glibc
@@ -0,0 +1 @@
+sys-libs/glibc releng/nosandbox
diff --git a/releases/portage/isos-qemu/package.use/libpcre b/releases/portage/isos-qemu/package.use/libpcre
new file mode 100644
index 00000000..84d84b54
--- /dev/null
+++ b/releases/portage/isos-qemu/package.use/libpcre
@@ -0,0 +1,5 @@
+# required by sys-libs/libselinux-2.7
+dev-libs/libpcre static-libs
+
+# required by dev-vcs/git
+dev-libs/libpcre2 jit
diff --git a/releases/portage/isos-qemu/package.use/no-asm b/releases/portage/isos-qemu/package.use/no-asm
new file mode 100644
index 00000000..1beb2353
--- /dev/null
+++ b/releases/portage/isos-qemu/package.use/no-asm
@@ -0,0 +1 @@
+dev-libs/libgcrypt -asm
diff --git a/releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch b/releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch
new file mode 100644
index 00000000..27ab38ba
--- /dev/null
+++ b/releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch
@@ -0,0 +1,41 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 4924dedc35..75eb66be3c 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1432,30 +1432,30 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 	fi
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
diff --git a/releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch b/releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch
new file mode 100644
index 00000000..27ab38ba
--- /dev/null
+++ b/releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch
@@ -0,0 +1,41 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 4924dedc35..75eb66be3c 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1432,30 +1432,30 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 	fi
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
diff --git a/releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch b/releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch
new file mode 100644
index 00000000..27ab38ba
--- /dev/null
+++ b/releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch
@@ -0,0 +1,41 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 4924dedc35..75eb66be3c 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1432,30 +1432,30 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 	fi
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST) -f \
++		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-j0 -d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt