summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatoro Mahri <matoro_gentoo@matoro.tk>2023-11-04 22:43:54 -0400
committerSam James <sam@gentoo.org>2023-11-07 20:33:55 +0000
commitdc008392c7fe6e3fb641652ba4ba97e113a9db66 (patch)
treeaa36c5ebb7af982cff874f2aa5e13a93ecd04141
parentdev-python/lmdb: Enable py3.12 (diff)
downloadgentoo-dc008392c7fe6e3fb641652ba4ba97e113a9db66.tar.gz
gentoo-dc008392c7fe6e3fb641652ba4ba97e113a9db66.tar.bz2
gentoo-dc008392c7fe6e3fb641652ba4ba97e113a9db66.zip
dev-util/patchelf: add patch for alpha support
See: https://github.com/NixOS/patchelf/pull/529 Bug: https://bugs.gentoo.org/835964 Signed-off-by: Matoro Mahri <matoro_gentoo@matoro.tk> Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-util/patchelf/files/patchelf-0.18.0-alpha.patch29
-rw-r--r--dev-util/patchelf/patchelf-0.18.0.ebuild1
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch b/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch
new file mode 100644
index 000000000000..c546a4dc2e9b
--- /dev/null
+++ b/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/909738
+https://github.com/NixOS/patchelf/pull/529
+Note this has removed the unit test changes because it involves adding a binary
+file which is not supported in portage for now, see
+https://bugs.gentoo.org/835964
+
+commit dbc9aeaadfd982b2d8a04eb74cbcecb83208844d
+Author: matoro <matoro@users.noreply.github.com>
+Date: Sat Nov 4 20:01:22 2023 -0400
+
+ Fix page size on Alpha
+
+ All tests pass.
+
+ Also explicitly specifies -no-pie for executables which should have it
+ disabled, to be compatible with gccs built with --enable-default-pie.
+
+diff --git a/src/patchelf.cc b/src/patchelf.cc
+index b42111d..b4d4a7d 100644
+--- a/src/patchelf.cc
++++ b/src/patchelf.cc
+@@ -367,6 +367,7 @@ unsigned int ElfFile<ElfFileParamNames>::getPageSize() const noexcept
+ // requirements. There is no authoritative list of these values. The
+ // current list is extracted from GNU gold's source code (abi_pagesize).
+ switch (rdi(hdr()->e_machine)) {
++ case EM_ALPHA:
+ case EM_IA_64:
+ case EM_MIPS:
+ case EM_PPC:
diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index 19d9351a66a2..d5a6cabb6087 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
PATCHES=(
"${FILESDIR}"/${PN}-glibc-dt-mips-xhash.patch
+ "${FILESDIR}"/${PN}-0.18.0-alpha.patch
)
src_prepare() {