[gentoo-commits] repo/gentoo:master commit in: dev-util/patchelf/files/, dev-util/patchelf/

[gentoo-commits] repo/gentoo:master commit in: dev-util/patchelf/files/, dev-util/patchelf/

[James Le Cuirot]

commit:     306f0be7307c0edf4ef397cbdf9e7363e7ed458a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 22:02:51 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 22:02:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306f0be7

dev-util/patchelf: Drop old 0.8

Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-util/patchelf/Manifest                      |  1 -
 dev-util/patchelf/files/patchelf-0.8-dash.patch | 28 ------------------
 dev-util/patchelf/patchelf-0.8.ebuild           | 38 -------------------------
 3 files changed, 67 deletions(-)

diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 627efaa2f90..87e5c479f3f 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,2 +1 @@
 DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
-DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a

diff --git a/dev-util/patchelf/files/patchelf-0.8-dash.patch b/dev-util/patchelf/files/patchelf-0.8-dash.patch
deleted file mode 100644
index 4210b1c054d..00000000000
--- a/dev-util/patchelf/files/patchelf-0.8-dash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3b9e7913a6d14cb09ed91ce8a1110955bda200ef Mon Sep 17 00:00:00 2001
-From: Alexandre Pretyman <alexandre.pretyman@gmail.com>
-Date: Tue, 14 Jul 2015 09:12:38 -0400
-Subject: [PATCH] Change configure.ac from OpenWrt to support Mac OS
-
-This change is from the OpenWrt project, from the URL:
-https://dev.openwrt.org/ticket/18998
-It enables patchelf to sucessfully compile and run under Mac OS and
-keeps compatibility with Linux.
-
-Tested under Mac OS X 10.9.5 and Ubuntu 15.04 to patch a binary of type
-ELF 32-bit LSB executable - the patch fully worked
-
-This patch is credited to Felix Fietkau
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8ca9ad4..69e12de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
-+AC_INIT([patchelf], m4_esyscmd([printf $(cat ./version)]))
- AC_CONFIG_SRCDIR([src/patchelf.cc])
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])

diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
deleted file mode 100644
index 3a3ffaccefd..00000000000
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="http://nixos.org/patchelf.html"
-SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE=""
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}"/${P}-dash.patch )
-
-src_prepare() {
-	rm src/elf.h || die
-	sed -e 's:-Werror::g' -i configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1 \
-							 CFLAGS+=" -no-pie" \
-							 CXXFLAGS+=" -no-pie"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/patchelf/files/, dev-util/patchelf/

[James Le Cuirot]

commit:     3baf1a6f70fba59102f8e1eeb46cb8291e4b9a8a
Author:     LinuxUserGD <hugegameartgd <AT> gmail <DOT> com>
AuthorDate: Sat Apr 15 16:29:53 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 07:45:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baf1a6f

Add define for DT_MIPS_XHASH

Closes: https://bugs.gentoo.org/860888
Signed-off-by: LinuxUserGD <hugegameartgd <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30604
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch | 9 +++++++++
 dev-util/patchelf/patchelf-0.18.0.ebuild                   | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch b/dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch
new file mode 100644
index 000000000000..fd92c803ac7c
--- /dev/null
+++ b/dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch
@@ -0,0 +1,9 @@
+Add define for DT_MIPS_XHASH (MIPS gnu hash support) using system elf.h header.
+Bug: https://bugs.gentoo.org/860888
+--- /dev/null
++++ b/src/elf.h
+@@ -0,0 +1,4 @@
++#include_next <elf.h>
++#ifndef DT_MIPS_XHASH
++#define DT_MIPS_XHASH 0x70000036
++#endif

diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index cbc25bb40a74..b0778e8b721b 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -12,9 +12,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-glibc-dt-mips-xhash.patch
+)
+
 src_prepare() {
-	default
 	rm src/elf.h || die
+	default
 
 	sed -i \
 		-e 's:-Werror::g' \

[gentoo-commits] repo/gentoo:master commit in: dev-util/patchelf/files/, dev-util/patchelf/

[Sam James]

commit:     dc008392c7fe6e3fb641652ba4ba97e113a9db66
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sun Nov  5 02:43:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 20:33:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc008392

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 <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../patchelf/files/patchelf-0.18.0-alpha.patch     | 29 ++++++++++++++++++++++
 dev-util/patchelf/patchelf-0.18.0.ebuild           |  1 +
 2 files changed, 30 insertions(+)

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() {