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 d09afff215..247fe251e9 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,2 +1,3 @@ -DIST patchelf-0.8.tar.bz2 119369 SHA256 c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a WHIRLPOOL 64c56eda439dc114e4450428d7bde754a894ecbd8d2e0d1a29c3a53965527f76723fef9a240cd3686532f9202c84b23dd25cfe8e4f664ac33e08ca4056ef6780 -DIST patchelf-0.9.tar.bz2 159956 SHA256 a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83 SHA512 5bd3a1268b809f173debde5d34c3f736f38d7afb69decf609a422884c51eb1d5ccf62f2d454d4ef8b2c20e263ece49e3c2f801347ef1dfcceecd89c78a214790 WHIRLPOOL 040b568fcac1e73cdf4ef928af7171e74402e2197918a00573624a92c9db444f7c45facd4cc629d8fdc629ba771a04236420444b4f67d0a732a636c51ecc16a4 +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 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.8-dash.patch b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.8-dash.patch deleted file mode 100644 index 4210b1c054..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -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/sdk_container/src/third_party/portage-stable/dev-util/patchelf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/metadata.xml index 1769853ef7..435c7a87ac 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/metadata.xml @@ -1,5 +1,5 @@ - + chewi@gentoo.org 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 new file mode 100644 index 0000000000..481b26d569 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.10.ebuild @@ -0,0 +1,30 @@ +# 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.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.13.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.9.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.13.ebuild index 47264579dd..e66de9a4ae 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.13.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools 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" +HOMEPAGE="https://github.com/NixOS/patchelf" +SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" LICENSE="GPL-3" src_prepare() { @@ -18,7 +18,6 @@ src_prepare() { sed -i \ -e 's:-Werror::g' \ - -e 's:parallel-tests:serial-tests:g' \ configure.ac || die eautoreconf 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.14.3.ebuild new file mode 100644 index 0000000000..e66de9a4ae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.14.3.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables" +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" +LICENSE="GPL-3" + +src_prepare() { + default + rm src/elf.h || die + + sed -i \ + -e 's:-Werror::g' \ + configure.ac || die + + eautoreconf +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.8.ebuild deleted file mode 100644 index 92c86cecf1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.8.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# 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 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 -}