| 1 |
commit: 135d88401a60dbbc0905c1f16391cea46b8d0cc0 |
| 2 |
Author: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 30 06:47:12 2022 +0000 |
| 4 |
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 06:47:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=135d8840 |
| 7 |
|
| 8 |
sys-devel/mold: don't invoke python during build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/841575 |
| 11 |
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> |
| 12 |
|
| 13 |
.../mold/files/mold-1.2.1-install-nopython.patch | 34 ++++++++++++++++++++++ |
| 14 |
.../{mold-1.2.1.ebuild => mold-1.2.1-r1.ebuild} | 5 ++++ |
| 15 |
sys-devel/mold/mold-9999.ebuild | 5 ++++ |
| 16 |
3 files changed, 44 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..661d3dcf392f |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch |
| 23 |
@@ -0,0 +1,34 @@ |
| 24 |
+From 4fb6d4208cfb20bad4a3491a18e78409b5a8183f Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Matthew Smith <matt@×××××××××.uk> |
| 26 |
+Date: Sat, 30 Apr 2022 07:42:50 +0100 |
| 27 |
+Subject: [PATCH] Don't invoke Python to create libexec/mold/ld symlink |
| 28 |
+ |
| 29 |
+Reverts commits 8073a92614fb59f59570031badab5dd4bc3b4f7f and |
| 30 |
+5803c3c200f301adc3abdb66df16d3d669712d70. |
| 31 |
+ |
| 32 |
+Bug #841575 |
| 33 |
+--- |
| 34 |
+ Makefile | 7 +------ |
| 35 |
+ 1 file changed, 1 insertion(+), 6 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/Makefile b/Makefile |
| 38 |
+index d1abc850..10e053a9 100644 |
| 39 |
+--- a/Makefile |
| 40 |
++++ b/Makefile |
| 41 |
+@@ -204,12 +204,7 @@ install: all |
| 42 |
+ $(STRIP) $D$(LIBDIR)/mold/mold-wrapper.so |
| 43 |
+ |
| 44 |
+ $(INSTALL) -d $D$(LIBEXECDIR)/mold |
| 45 |
+- |
| 46 |
+-# We want to make a symblink with a relative path, so that users can |
| 47 |
+-# move the entire directory to other place without breaking the reference. |
| 48 |
+-# GNU ln supports `--relative` to do that, but that's not supported by |
| 49 |
+-# non-GNU systems. So we use Python to compute a relative path. |
| 50 |
+- ln -sf `python3 -c "import os.path; print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` $D$(LIBEXECDIR)/mold/ld |
| 51 |
++ ln -sf $(BINDIR)/mold $D$(LIBEXECDIR)/mold/ld |
| 52 |
+ |
| 53 |
+ $(INSTALL) -d $D$(MANDIR)/man1 |
| 54 |
+ $(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1 |
| 55 |
+-- |
| 56 |
+2.35.3 |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/sys-devel/mold/mold-1.2.1.ebuild b/sys-devel/mold/mold-1.2.1-r1.ebuild |
| 60 |
similarity index 96% |
| 61 |
rename from sys-devel/mold/mold-1.2.1.ebuild |
| 62 |
rename to sys-devel/mold/mold-1.2.1-r1.ebuild |
| 63 |
index a9e0aa6a2c2e..87931221e192 100644 |
| 64 |
--- a/sys-devel/mold/mold-1.2.1.ebuild |
| 65 |
+++ b/sys-devel/mold/mold-1.2.1-r1.ebuild |
| 66 |
@@ -28,6 +28,11 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:= |
| 67 |
# TODO: restore SYSTEM_XXHASH upstream? |
| 68 |
DEPEND="${RDEPEND}" |
| 69 |
|
| 70 |
+PATCHES=( |
| 71 |
+ # Bug #841575 |
| 72 |
+ "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch |
| 73 |
+) |
| 74 |
+ |
| 75 |
pkg_pretend() { |
| 76 |
# Requires a c++20 compiler, see #831473 |
| 77 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 78 |
|
| 79 |
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild |
| 80 |
index a9e0aa6a2c2e..87931221e192 100644 |
| 81 |
--- a/sys-devel/mold/mold-9999.ebuild |
| 82 |
+++ b/sys-devel/mold/mold-9999.ebuild |
| 83 |
@@ -28,6 +28,11 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:= |
| 84 |
# TODO: restore SYSTEM_XXHASH upstream? |
| 85 |
DEPEND="${RDEPEND}" |
| 86 |
|
| 87 |
+PATCHES=( |
| 88 |
+ # Bug #841575 |
| 89 |
+ "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch |
| 90 |
+) |
| 91 |
+ |
| 92 |
pkg_pretend() { |
| 93 |
# Requires a c++20 compiler, see #831473 |
| 94 |
if [[ ${MERGE_TYPE} != binary ]]; then |
Archives