From b274ed6eaba3335b56a45cf9c5801d47f2efbaf7 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 12 Aug 2022 14:45:53 +0200 Subject: [PATCH] dev-util/patchelf: Sync with Gentoo It's from Gentoo commit b0dfc9160b045a6c9f17e40cf26989209c3bf02d. --- .../portage-stable/dev-util/patchelf/Manifest | 5 ++-- .../dev-util/patchelf/patchelf-0.10.ebuild | 30 ------------------- ...elf-0.13.ebuild => patchelf-0.14.5.ebuild} | 4 +-- ...f-0.14.3.ebuild => patchelf-0.15.0.ebuild} | 4 +-- 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.10.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/patchelf/{patchelf-0.13.ebuild => patchelf-0.14.5.ebuild} (80%) rename sdk_container/src/third_party/portage-stable/dev-util/patchelf/{patchelf-0.14.3.ebuild => patchelf-0.15.0.ebuild} (77%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest index 247fe251e9..6709bd2b29 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest @@ -1,3 +1,2 @@ -DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501 -DIST patchelf-0.13.tar.gz 117997 BLAKE2B 5db88c9ff9103f2e4b8e15d7dc0d677c3956a85ce5e86e371c4c32a21c3bc219990edd71a20a6b650342eff1068c0ba0976529d62d21dcc17dfc020abf7167ec SHA512 0b4cb41dc1b76d1c0f46655d8b1c56187d2bf18fa12fad9ad6e8acd321a98df372713a92c6649479498bb5939c91ce16a1032ec03afc5a2f7c92cd68882c2bd9 -DIST patchelf-0.14.3.tar.gz 123722 BLAKE2B ca9c28c88ff6a5eb37a8cb9010642f04335b74e2132987f34bc167c140dc95cd4ac7a3ed71b7287d952a0201b12148a15f3066e5c7d3d453cc18a1e97b6283ed SHA512 2f5caa6b038e630896dc0cebaf4d6f88d91f6dee7f2ffa2fc6b90d199b3a0140b7fe39ea43e582f7ac1145309a61e11fb7ce36c579ad217c48f1b189738f79c8 +DIST patchelf-0.14.5.tar.gz 124767 BLAKE2B f2e02fb468db7c8c0c4270c7f95ea6c8dc6ffab7ddb0a6479bd5d1dd0481cbc55982af21a13f42076504417264a11e74d50a9f15d3d5735e47019001abf33e41 SHA512 1b7eca84f6fe2d6f6d4469ca1ccdf35dc920d2052ba94b7daeba6c8cb41fdaff20b1e5bac7c8a7650ff12bf4156da87f84d32e75b09958636dc992a1b7b1a59d +DIST patchelf-0.15.0.tar.gz 125803 BLAKE2B 08fc2cffd7d9e835c01c828c16762fb0b3c3e422990f2d0028a65a3e0ec849d01bdef699b6f68afa6bf307e34f5e76121fc94460793c95c055552e1d8a68d772 SHA512 3b2d3d6458be5b2d43cd2878dfb1a185a95cc13cd4c94abd0ee79979afb36f46e347acc292b8d9c2954a342b7291774e6a1b63930e9f90a1cf4179ec075ab046 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.10.ebuild deleted file mode 100644 index 481b26d569..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.10.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables" -HOMEPAGE="https://nixos.org/patchelf.html" -SRC_URI="https://nixos.org/releases/${PN}/${P}/${P}.tar.bz2" -SLOT="0" -KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-3" - -src_prepare() { - default - rm src/elf.h || die - - sed -i \ - -e 's:-Werror::g' \ - configure.ac || die - - eautoreconf -} - -src_test() { - emake check \ - CFLAGS+=" -no-pie" \ - CXXFLAGS+=" -no-pie" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.5.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.13.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.5.ebuild index e66de9a4ae..03f3d1f7fb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ 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 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" LICENSE="GPL-3" src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.15.0.ebuild similarity index 77% rename from sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.15.0.ebuild index e66de9a4ae..da2daad848 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.15.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ 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 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux" LICENSE="GPL-3" src_prepare() {