diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/ChangeLog deleted file mode 100644 index 1f220842eb..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/ChangeLog +++ /dev/null @@ -1,44 +0,0 @@ -# ChangeLog for dev-util/patchelf -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/ChangeLog,v 1.8 2013/03/08 17:02:30 jlec Exp $ - - 08 Mar 2013; Justin Lecher - files/patchelf-0.6-test-build.patch: - Enhance the patch for as-needed problems - - 08 Mar 2013; Justin Lecher - files/patchelf-0.6-test-build.patch: - Fix linking of test, #455454 - -*patchelf-0.6-r1 (04 Feb 2013) - - 04 Feb 2013; Justin Lecher +patchelf-0.6-r1.ebuild, - +files/patchelf-0.6-test-build.patch: - Use system header, thanks fedora; respect CC, CFLAGS and LDFLAGS in test - binaries - - 30 Jan 2013; Justin Lecher -patchelf-0.5.ebuild, - metadata.xml: - Drop old - - 30 Jan 2013; Agostino Sarubbo patchelf-0.6.ebuild: - Stable for x86, wrt bug #454620 - - 30 Jan 2013; Agostino Sarubbo patchelf-0.6.ebuild: - Stable for amd64, wrt bug #454620 - -*patchelf-0.6 (11 Nov 2011) - - 11 Nov 2011; Justin Lecher patchelf-0.5.ebuild, - +patchelf-0.6.ebuild, metadata.xml: - Version Bump and move to EAPI=4 - - 30 Nov 2010; Justin Lecher +patchelf-0.5.ebuild, - +metadata.xml: - New package (copied from app-admin/patchelf) - -*patchelf-0.5 (14 Nov 2010) - - 14 Nov 2010; Justin Lecher +patchelf-0.5.ebuild, - +metadata.xml: - New addition 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 b360433508..d09afff215 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,16 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX patchelf-0.6-test-build.patch 2421 SHA256 cac60dca4d06c93ff03a96f357254af61bb687e0679b1823ef94926e2c924fad SHA512 233d07b04337cb82e0f31311beb00f77c2a5a5bd9cf811dbe197f6085d16cbec85902e9b271e42ca1b4ed11bde5269d7a98279563de454262fbbd9fd38cc6dce WHIRLPOOL 0e6cb3afd7752f396f03dbe337e2e1f4be112e4dbf44dd7d57c03d717f19a61d5311ccdb460cc0a6de9e4a14d374e471e0a474075293b70d9312878ecf3d3c79 -DIST patchelf-0.6.tar.bz2 113860 SHA256 fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01 SHA512 0b228c7058b1d32104648a77b37720fd942cd53942d542dccc5662f6012b8d4487d5d1512a68319e73fda05640330611c9ea41ed7d94a0d109056f471a79dfc6 WHIRLPOOL f29cd868f31a5884f04a74273bf6ef9da312cb0fe1c2707ef320098108d0d17fb33ada058d4f8169eef2dee79ef40fabaaba5490a7fae536fb6ffeb2793bebe4 -EBUILD patchelf-0.6-r1.ebuild 892 SHA256 09ed2f951d7d9d93d30e332a43223e9d2d43d58f2eb84135aac6d38f1b69e75f SHA512 60027cb29589162386365ad69cbeb54eefa27cb0ad3c79cda6ba53dc2ae1e780f948df8365056eff9fdbf53badf312b96b60ca28b48f95d0889a99f93de30c5d WHIRLPOOL dc74f91dbd5fb6c34d00d848a6067249ad8f40dc5163960b2ac29de97e4776daefe0dd65a9d073f9970c2fc59759dc75af5062d293490a6d4fcddb5d7a4dbef7 -EBUILD patchelf-0.6.ebuild 598 SHA256 d44ad5be2c7db2dfc75045472e9f754be1348072ceee311414ed03e028e4e2e5 SHA512 97fc4d2b15b27dad735055b8af3ef501ed67acc12c98d05bc2d512bfdeb6a3e994347a713538183e0c12d5f163d2d37966703e87c1a8d83606abc40fd6a7fd8a WHIRLPOOL 34e20c55e7abeae721639caf3a76f9186aa907de6998e69d0d546b2272432ac718764018ed473ceabfabaeb0d42b228782a10e031f545c662bf9b1974c5a8edc -MISC ChangeLog 1427 SHA256 c4071b8034487bc4076f99ef6ad28b4933dc636e387a2a2f8db43dc5c8fc86e1 SHA512 44d2bfd6d3a221f6a17575f1588fbd94bafd26185461543d21789c0383676336769c905ca20eaa8e2c73cb1bedf5a43e6b52653cae81c29897c428be3e2512c4 WHIRLPOOL ba120c40181a538692233de7bdccb850cb0c0903ce0331dcf1adfd7622a59b610f2b2dbc0ddd04c6029b18a11d65a252c1fdb3a1f854608a96b3ec7cde5bb506 -MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlE6GacACgkQgAnW8HDreRZeOwCbBpNZc38I9KT/pHPDeBwNzZLV -SnkAnAsZH31yyGVvxICp0R6/Lf2FbUE8 -=itHo ------END PGP SIGNATURE----- +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 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.6-test-build.patch b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.6-test-build.patch deleted file mode 100644 index 2f88b2af7c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.6-test-build.patch +++ /dev/null @@ -1,58 +0,0 @@ - tests/Makefile.am | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 9d9b6bc..93677a3 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -11,38 +11,38 @@ simple_SOURCES = simple.c - main_scoped_SOURCES = - - --main: main.o libfoo.so -- LD_LIBRARY_PATH=. gcc -Wl,--disable-new-dtags -o main main.o -L . -lfoo -+main: main.o libfoo.so libbar.so -+ $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -o main main.o -L . -lfoo -lbar - --main-scoped: main.o libfoo-scoped.so -- LD_LIBRARY_PATH=. gcc -Wl,--enable-new-dtags -o main-scoped main.o -L . -lfoo-scoped -+main-scoped: main.o libfoo-scoped.so libbar-scoped.so -+ LD_LIBRARY_PATH=. $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--enable-new-dtags -o main-scoped main.o -L . -lfoo-scoped -lbar-scoped - - main.o: main.c -- $(CC) -fpic -o main.o -c main.c -+ $(CC) $(CFLAGS) -fpic -o main.o -c main.c - - libfoo.so: foo.o libbar.so -- NIX_DONT_SET_RPATH=1 $(CC) -Wl,--disable-new-dtags -shared -o libfoo.so foo.o -L . -lbar -+ NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -shared -o libfoo.so foo.o -L . -lbar - - libfoo-scoped.so: foo.o libbar-scoped.so -- NIX_DONT_SET_RPATH=1 $(CC) -Wl,--enable-new-dtags -shared -o libfoo-scoped.so foo.o -L . -lbar-scoped -+ NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--enable-new-dtags -shared -o libfoo-scoped.so foo.o -L . -lbar-scoped - - foo.o: foo.c -- $(CC) -fpic -o foo.o -c foo.c -+ $(CC) $(CFLAGS) -fpic -o foo.o -c foo.c - - libbar.so: bar.o -- NIX_DONT_SET_RPATH=1 $(CC) -Wl,--disable-new-dtags -shared -o libbar.so bar.o -L . -Wl,-rpath,`pwd`/no-such-path -+ NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -shared -o libbar.so bar.o -L. -Wl,-rpath,`pwd`/no-such-path - - libbar-scoped.so: bar.o -- NIX_DONT_SET_RPATH=1 $(CC) -Wl,--enable-new-dtags -shared -o libbar-scoped.so bar.o -+ NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--enable-new-dtags -shared -o libbar-scoped.so bar.o - - bar.o: bar.c -- $(CC) -fpic -o bar.o -c bar.c -+ $(CC) $(CFLAGS) -fpic -o bar.o -c bar.c - - - big_dynstr_SOURCES = big-dynstr.c - - big-dynstr: big-dynstr.o libfoo.so -- LD_LIBRARY_PATH=. gcc -Wl,--disable-new-dtags -o big-dynstr big-dynstr.o -L . -lfoo -+ LD_LIBRARY_PATH=. $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -o big-dynstr big-dynstr.o -L . -lfoo - - big-dynstr.c: main.c - cat main.c > big-dynstr.c 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 new file mode 100644 index 0000000000..4210b1c054 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/files/patchelf-0.8-dash.patch @@ -0,0 +1,28 @@ +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 4a00a64b40..1769853ef7 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,7 +1,7 @@ - - jlec@gentoo.org + + chewi@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.6.ebuild deleted file mode 100644 index 99a0c2d8a1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.6.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/patchelf-0.6.ebuild,v 1.3 2013/01/30 15:48:37 ago Exp $ - -EAPI=4 - -NUMBER="1524660" - -DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables." -HOMEPAGE="http://nixos.org/patchelf.html" -SRC_URI="http://hydra.nixos.org/build/${NUMBER}/download/2/${P}.tar.bz2" - -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-3" -IUSE="" - -src_configure() { - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.8.ebuild similarity index 59% rename from sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.6-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.8.ebuild index 09f376cb83..92c86cecf1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.6-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.8.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/patchelf-0.6-r1.ebuild,v 1.1 2013/02/04 15:59:31 jlec Exp $ EAPI=5 @@ -8,23 +7,22 @@ AUTOTOOLS_AUTORECONF=true inherit autotools-utils -NUMBER="1524660" - -DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables." +DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables" HOMEPAGE="http://nixos.org/patchelf.html" -SRC_URI="http://hydra.nixos.org/build/${NUMBER}/download/2/${P}.tar.bz2" +SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" LICENSE="GPL-3" IUSE="" -PATCHES=( "${FILESDIR}"/${P}-test-build.patch ) - 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 } 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.9.ebuild new file mode 100644 index 0000000000..47264579dd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.9.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +LICENSE="GPL-3" + +src_prepare() { + default + rm src/elf.h || die + + 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/metadata/md5-cache/dev-util/patchelf-0.6 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.6 deleted file mode 100644 index 2ae3b1c20f..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.6 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=configure -DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables. -EAPI=4 -HOMEPAGE=http://nixos.org/patchelf.html -KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux -LICENSE=GPL-3 -SLOT=0 -SRC_URI=http://hydra.nixos.org/build/1524660/download/2/patchelf-0.6.tar.bz2 -_md5_=72208ec7b4f95cfe2907e776ecaadab9 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.6-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.8 similarity index 79% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.6-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.8 index 88368fc0e0..cca34c7607 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.6-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.8 @@ -1,11 +1,11 @@ DEFINED_PHASES=compile configure install prepare test DEPEND=>=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables. +DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables EAPI=5 HOMEPAGE=http://nixos.org/patchelf.html -KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux LICENSE=GPL-3 SLOT=0 -SRC_URI=http://hydra.nixos.org/build/1524660/download/2/patchelf-0.6.tar.bz2 +SRC_URI=http://releases.nixos.org/patchelf/patchelf-0.8/patchelf-0.8.tar.bz2 _eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 -_md5_=a159f6711dcccbabcefd6def740912d1 +_md5_=0a6396255ca31b183f06906f05302ebd diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.9 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.9 new file mode 100644 index 0000000000..2c0dfdda37 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/patchelf-0.9 @@ -0,0 +1,11 @@ +DEFINED_PHASES=prepare +DEPEND=>=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables +EAPI=6 +HOMEPAGE=http://nixos.org/patchelf.html +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux +LICENSE=GPL-3 +SLOT=0 +SRC_URI=http://releases.nixos.org/patchelf/patchelf-0.9/patchelf-0.9.tar.bz2 +_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool e32ea84bf82cf8987965b574672dba93 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 +_md5_=d21397b6e78af39d09f7c9f1c675fffb