From 96a3f77365135d3d08473982b82177d72c6ecdaf Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 27 Nov 2023 07:11:38 +0000
Subject: [PATCH] dev-util/patchelf: Sync with Gentoo

It's from Gentoo commit 18504b0cbe1c77a6a6e08dc681c813b8e2adf764.
---
 .../files/patchelf-0.18.0-alpha.patch         | 29 +++++++++++++++++++
 .../dev-util/patchelf/patchelf-0.18.0.ebuild  |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.18.0-alpha.patch
new file mode 100644
index 0000000000..c546a4dc2e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.18.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.18.0.ebuild
index 19d9351a66..37dbfc7cc2 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-glibc-dt-mips-xhash.patch
+	"${FILESDIR}"/${PN}-0.18.0-alpha.patch
 )
 
 src_prepare() {