summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-03-08 17:02:31 +0000
committerJustin Lecher <jlec@gentoo.org>2013-03-08 17:02:31 +0000
commit498562d1ebb5e0431f8416a76615ed10de002916 (patch)
tree5410cee5280ebc24be10255ac04e9f4291cd5e21 /dev-util/patchelf
parentStable for HPPA (bug #457882). (diff)
downloadhistorical-498562d1ebb5e0431f8416a76615ed10de002916.tar.gz
historical-498562d1ebb5e0431f8416a76615ed10de002916.tar.bz2
historical-498562d1ebb5e0431f8416a76615ed10de002916.zip
dev-util/patchelf: Enhance the patch for as-needed problems
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'dev-util/patchelf')
-rw-r--r--dev-util/patchelf/ChangeLog6
-rw-r--r--dev-util/patchelf/Manifest10
-rw-r--r--dev-util/patchelf/files/patchelf-0.6-test-build.patch15
3 files changed, 18 insertions, 13 deletions
diff --git a/dev-util/patchelf/ChangeLog b/dev-util/patchelf/ChangeLog
index 4dec40fbe616..1f220842eb4a 100644
--- a/dev-util/patchelf/ChangeLog
+++ b/dev-util/patchelf/ChangeLog
@@ -1,6 +1,10 @@
# 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.7 2013/03/08 13:38:10 jlec Exp $
+# $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 <jlec@gentoo.org>
+ files/patchelf-0.6-test-build.patch:
+ Enhance the patch for as-needed problems
08 Mar 2013; Justin Lecher <jlec@gentoo.org>
files/patchelf-0.6-test-build.patch:
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index dd8ce416907f..b360433508d7 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX patchelf-0.6-test-build.patch 2316 SHA256 2371b75f89479834e7dde674c00d3e1ce4e1f89fe1053f3dffa1211aa2f18ca5 SHA512 e7025d80319182ac93b2635d8639bdfb330760743e2c33fd5860d8f0840e464deb198fa29bcc05bd0dfa6d5e270c0817e3716dea96a899ff28d2e76df68335c3 WHIRLPOOL 4d84680921d45390890ef7311862bb48a42f24e798e9d06b5faa0e4050f20e5adb3fff7984ce96b6dd912c93b42a16f67679c93bcd44b3c017bc3d044a091ed4
+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 1297 SHA256 afef4505a8df1988c6048afd49c2f0c297fa2b52798757c7416566cfa976397c SHA512 9ff70164aecccb8374eb375fad600a037c7139d331426a5d90ee2a888783a74bb4caf91bfeb80accfa3ace2869f1bac4f8e091d97cf0cdcb8639cb02a3a070c2 WHIRLPOOL 28579d7785728317aa904c51436cfc925bd74d851b19fd83bdb4f6d4e508ccf4e4a27172413f1f323415e05813ae954c3afa4ad760faf973a25130e2d0dfde48
+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)
-iEYEAREIAAYFAlE56cMACgkQgAnW8HDreRbAXQCgwXO8ofU3bYT+EB/sdJSD0mJM
-atYAoL+I0HtQGGiZfVY1rtNFrk4Xh7RY
-=9qn9
+iEYEAREIAAYFAlE6GacACgkQgAnW8HDreRZeOwCbBpNZc38I9KT/pHPDeBwNzZLV
+SnkAnAsZH31yyGVvxICp0R6/Lf2FbUE8
+=itHo
-----END PGP SIGNATURE-----
diff --git a/dev-util/patchelf/files/patchelf-0.6-test-build.patch b/dev-util/patchelf/files/patchelf-0.6-test-build.patch
index 4d741b525ca0..2f88b2af7cfc 100644
--- a/dev-util/patchelf/files/patchelf-0.6-test-build.patch
+++ b/dev-util/patchelf/files/patchelf-0.6-test-build.patch
@@ -1,8 +1,8 @@
- tests/Makefile.am | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
+ tests/Makefile.am | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 9d9b6bc..f345f46 100644
+index 9d9b6bc..93677a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,38 +11,38 @@ simple_SOURCES = simple.c
@@ -14,9 +14,10 @@ index 9d9b6bc..f345f46 100644
+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
+-main-scoped: main.o libfoo-scoped.so
- LD_LIBRARY_PATH=. gcc -Wl,--enable-new-dtags -o main-scoped main.o -L . -lfoo-scoped
-+ $(CC) $(LDFLAGS) $(CFLAGS) -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
@@ -36,7 +37,7 @@ index 9d9b6bc..f345f46 100644
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
++ 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
@@ -51,7 +52,7 @@ index 9d9b6bc..f345f46 100644
big-dynstr: big-dynstr.o libfoo.so
- LD_LIBRARY_PATH=. gcc -Wl,--disable-new-dtags -o big-dynstr big-dynstr.o -L . -lfoo
-+ $(CC) $(LDFLAGS) $(CFLAGS) -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