Fix lzma linkage #444050 by Marcin Mirosław.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 87 insertions, 8 deletions

diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index a4b097daa883..651636557166 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libunwind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.39 2014/02/12 00:31:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.40 2014/02/16 02:12:30 vapier Exp $
+
+  16 Feb 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/libunwind-1.1-lzma.patch, libunwind-1.1.ebuild:
+  Fix lzma linkage #444050 by Marcin Mirosław.
 
   12 Feb 2014; Jeroen Roovers <jer@gentoo.org> libunwind-1.1.ebuild:
   Stable for HPPA (bug #461394).
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index fb2336492027..8a25108f036a 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -5,19 +5,30 @@ AUX libunwind-0.99-disable-setjmp.patch 8566 SHA256 d9cce99c7e53414b7c364c1e1fd1
 AUX libunwind-0.99-implicit-declaration.patch 486 SHA256 f8f72c6160c6741ea2a3d251662fe3d8ecd63bfcf488527838e6d95e4dddd2a1 SHA512 071a59b3e9c46a045ce686abe5f6a70e6f007bbc3b2aaeeccdc900186346e44193ccee1ac63ddb5d37b7c9c161228f4d45de0d7b43d1ccab23f579496aa8ef90 WHIRLPOOL 08fd3bf9f83f7ff35edab20d4693634cf510cfa3c8cf50fa210510815c8b6129630ac04bb9e7640c042f837ca22f6ea7b9638d88f78722e8a6b60842306437f8
 AUX libunwind-1.0.1-disable-setjmp.patch 1236 SHA256 71e44f436674ad2b8459cda517b924ae85241df53c974eb0951a81614d179945 SHA512 33c9fb45cec2b3ea6d37abcf483af27b2dbf839c2986cf688809d235d6f49ace4666b05fb856a5aaa85856a71ed95df737b0c4dbd451ebf1f6a18e39b376e053 WHIRLPOOL 100a629730eb87412a71bcce57c07f2c01c191782c988be853ae0272f9f7120cbd8440a094253575895afedf1c92ec69d3c1bd5e830b5f02e278a4eacc0f7b14
 AUX libunwind-1.0.1-ia64.patch 5118 SHA256 d5de421a421a35e4efd4f7787d54095aebc310e205c5a412624b73db46530d82 SHA512 2a703cce762080b4581acccfc19a003b81d3a4ba7da4f620af41fc043590367359e16e5f16c95a399f347da61d2386d246d86d03ba195b022520cb326cc27dfe WHIRLPOOL aec72622f42083af788f87ac3130afec36a91eb82591b4df554ab3232a709938b557fd51e1c4e84540198f97ff6a25cf7905a3c728b9c5249f8b16753496b84e
+AUX libunwind-1.1-lzma.patch 3004 SHA256 84716d048c507862761f4889871ab6428f9ca5818baeb3bddbc5612d5ff3ef15 SHA512 d15f849d743426fd030de2990d683a5373273ecfc407b081280e7f5fb2e65350496badb7b094911719e5b3f6bdac5ddf2653e556391c58a8559938a11f60250c WHIRLPOOL 3d56eed2a93fa373516d923bf0c491c68c464e62c0302ba0bc995d2491b27b01b109dd750bc47079f66c163c5f1a1a5d13c541709c0090ff78926bcdc98da992
 DIST libunwind-0.99.tar.gz 711817 SHA256 56083aae17eab3ccb7a36b95f0430f5a5f258755bf193bb5ca4fd4b918356164 SHA512 26796c546490c3065d04e2143b8a4a7bcc3d3d8fc0c1c8bc1da1ddfb6abc0807d994fe83f008e82ba7cb78525d6fe66800aafa266e931a6aef9813283f904daf WHIRLPOOL 868cf12c71fb1ca64da185e3e804bcddfafd70f8c443c7ca5684f9fa99f1a1943bb75cc4137082a5bd3865a6aeea39c1b2ad68d62db261d14164afded8f0ee3e
 DIST libunwind-1.0.1.tar.gz 1028725 SHA256 aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f SHA512 e360f0c0abf1e8b153a01cf522237495cecd9b4c689fa55868e60cec86f650e86ceefa283c045fa3d4bd50dc130e75ce7a8ad221c8f938c20a56f106aa3de8c5 WHIRLPOOL 0a2bcfdabb97cb541f7050203db4b658d0b853fdeb504e5917a731547a673e78db9ea0a64ee17ffc137017fc474c7ba44086fdbf2f5f3519993b5bd0048c76b4
 DIST libunwind-1.1.tar.gz 1098603 SHA256 9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a SHA512 bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1 WHIRLPOOL 1a0e566edf92c0563cb5525203f2718c3454bc0be25ec8079cde8441de08b6d8951db7cbf2f0a02a4a0f1e6c350e74e551a482d9094996daefa216a79bc9d383
 EBUILD libunwind-0.99-r1.ebuild 1103 SHA256 962c93f91523135b31c45f726accc1f2d87f2b5877d5fcefa2790861d84bef2f SHA512 e8a335060b4955034ebade25644f171af878960f869742585fbef5a65ed48657d7eaaa7172ea1ab322efe9009135716fe0d34d5a67905f9ed8863fe85cdde3eb WHIRLPOOL 0e0b318c5f9db6252224ac56980141d9512d326d1c18672210a5f4d1e0b71638e3d70c54ffc548a09a2363d09ad6db8ba1861cf116d77e41dfe1d1ddfee25166
 EBUILD libunwind-1.0.1-r1.ebuild 1947 SHA256 e7e609213039ab1103d903ca041fd11bc3e1d0fa91ce4850e4dba1cc93dcc25e SHA512 a07fbafa2f86de9929d96177d6b463d4bda1a19fd3060c2ff37faf084cdc2507833d8fa24dea530bb49b49ccbad41d17fc57b1cae90290481a31e6bfc3392ef1 WHIRLPOOL 0fd1b08e6042b8271bb2641a8827484f55651f20892365189ab98b9b68deca631732620a2a3bab41cf79c8a6ef5bb844a82f373c69a6c5c7c6166ad2e521450d
 EBUILD libunwind-1.0.1.ebuild 1407 SHA256 f23c9405452a13e7238b55bbaff71c7636ef47605a618d3eac55914410ff7036 SHA512 dc01f58db7fd25f14e3075090e000e22c83ce192069880bd36a72d66af16da0865e22b9d15a2329e6a1eecaeeb5474810bbdc1dcc574779c5f5dc09414963630 WHIRLPOOL 9e5cef0cda05c72b20cc5b8d066d2b669c58a8c983e448670c4434a96ac596f77b6e2ec68d61f837de650e6e2b84d916272a1ea63b33fe4e622515a0af63bbfd
-EBUILD libunwind-1.1.ebuild 2415 SHA256 939851479ab7b82a82f0c659575a0d47ec760a9e270cb0002681ed8f161ba7d8 SHA512 fcf38a162c975acf88aeb7b09cd13fdfb41d8b3a41a6499fd485fc441c2f7e306dc6e320f24d59298c3a0fda36b677ec7ffa5b1dcd3c75f0b2466cecd2c3029b WHIRLPOOL 63a277688193b25bbd8860198ea2057018513a69d3b8041a95642e4a1133372d5730fdab9f9a76d889d5f44ef5486e73e426910986e16103e3c9b55e9adfb8b6
-MISC ChangeLog 5492 SHA256 889008f3557b98c51b9ff1904a2101b69360118509e7e51d947f213d7c65c536 SHA512 748e111b2dc1cc4e36d78c01632a5cab5f337bb9129c76ad0637df3afe299bf2058c59ff48172a212550d8a2ca213e0a99cf5f2acb8d4b5dcfcc670d223aaa24 WHIRLPOOL daea32bb82befca94ab2e8a3a92e3b9b40aa29bc9a3975ebcdbd2f54facb0e6b203cb6e76b7203f88be817d3590a888d52f0a455f244281c87f7eee8a8f01a1e
+EBUILD libunwind-1.1.ebuild 2464 SHA256 1e444b4023c2109a9699acde01fbdf94881409ca53f3bf5d6ecefe8a4871a166 SHA512 678a61be53acd408b5d4ca623f9a82c42d7f8cf94c324fe2e43692161689464fbb39db9db4cfa36c9c56b925f0bf9d33649a5f3404bc48f50b346e034e10fa6e WHIRLPOOL c29fd90dfba4339273542ee4877099414486ce055842aeca896c10e23a5954bbbeba3a012fe2d5e9be5daf32a6c563446f5dcf321435106b88d91a6ea0ccd6d3
+MISC ChangeLog 5651 SHA256 4d5faa2ae3d1d147b51625bccc00279eb1f2f688a060f45f91bec670c544aeb8 SHA512 6151fed2d16a85ff15d0812938eaef63c84a9f72cda49d1fcb959670c44070cc36e27a9e0b3d9f10a74e307826ea52812bf571f745a7333c3c8b5996bd158aa3 WHIRLPOOL e49cc34198af6ea97435ab208f2b6cd2907ea922010e94b68c0a32cc40595b7d47aa0f958cb1b8024a95234af276385ba948124c3521601bd6cd996e8e0deaa9
 MISC metadata.xml 391 SHA256 85a52322c0bd2246a77a82d55d1fc8556b07e66f24ff5c7d3cf7f39a91622c3d SHA512 3caaa160e93a0248f58d203cff96b73970d53bbb56f0896604f0722300f30a82d7f3dce26a6ace71209b2baca34f5479b2791bbf9ac7fabf3d241f572a70b215 WHIRLPOOL 5182103d5226b341843b93d6840c12b8d4292ea1928820219f4eebe9ae8df9257269f9aa26b3fbbe09af98ae578290d5d16fd04ed0b0944cba4a23ec89d09fb5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL6wOUACgkQVWmRsqeSphM1UgCeOIZuTOGNB6sPNXx3KjAu7Jhu
-c1EAn1wadmZwTA+waIPUlYCtgE4NSWUK
-=IlfK
+iQIcBAEBCAAGBQJTAB6VAAoJEPGu1DbS6WIAGCQQAJwKZxfj+NgiYyfcEDdXPt6b
+3zvPNQFhf3UmVCoFun3Avu0nPfDkSK4wc7aNF91K6fuvsfmJKZGepoCfDGXIxRvV
+BOVdsYza/Lx+vHQKgbxzSt6z+8rMSjxXDg9Po0iEwma7L7hm8B0kO9IBs8UTjUhM
+raF3gWZ8j+iWP8WQFxxXsUpBP3wRbGg2I6y3Fu/sGOh1RjaG9gGEye8BrudvM8/8
+JVWfORHpHPoGA13DMz9f2hHEujBMZDwIVW9sqv5rc6JOdr0wbt0KSfDItuhCV9Z8
+QV4r8/5EabhmvVOw8ZjjNZDlotY7Lr20hKWivqhnmPEjJwmsKXOrIZwwP7meNLo8
+yYCWlaLyP1oq1dtN11jNbNJrvjNfr9E8nGBqi59+TWqa38FJ0CDvvsx5/PlbITKS
+eOo/PCpsijT68L4f7AimEMh4X6y7ggNMuVvJ/t7kEY/DkUfj2jAVqIhMXfgkSKLP
+BNjDLu9XVFKnz+IbqF1+JmwbjAw3XK5JoEHT1fdQ61mHeUN+s2afXmbJtGZGxGvJ
+OJ4vLJeoWoMe6HvdjJKfw5ai2/qdf06KJACXZFtZojOengQNS11kL2yWzm6xKPDH
+rOi9eoRT86LDF5IYKYCcERBssVNVZCAFEyQzr/fx/A2pk9ZqFEVbg2qeTVUvgi4r
+e+juPurMx9viQDR4RR5A
+=Jj7N
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch b/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
new file mode 100644
index 000000000000..09cefa028539
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
@@ -0,0 +1,63 @@
+From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 15 Feb 2014 21:00:59 -0500
+Subject: [PATCH] link sublibs against liblzma as needed
+
+The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
+it.  This produces sub-shared libs that don't link against lzma and can
+make the linker angry due to underlinking like so:
+
+libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
+	-frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
+	-Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
+	-o .libs/test-coredump-unwind test-coredump-unwind.o  \
+	../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size'
+../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode'
+collect2: error: ld returned 1 exit status
+
+So add LIBLZMA to the right LIBADD for each of these libraries.
+
+URL: https://bugs.gentoo.org/444050
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
+ @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
+-libunwind_coredump_la_LIBADD =
++libunwind_coredump_la_LIBADD = $(LIBLZMA)
+ am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
+ 	coredump/_UCD_create.c coredump/_UCD_destroy.c \
+ 	coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
+@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \
+ libunwind_dwarf_local_la_OBJECTS =  \
+ 	$(am_libunwind_dwarf_local_la_OBJECTS)
+ @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
+-libunwind_elf32_la_LIBADD =
++libunwind_elf32_la_LIBADD = $(LIBLZMA)
+ am_libunwind_elf32_la_OBJECTS = elf32.lo
+ libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
+ @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
+-libunwind_elf64_la_LIBADD =
++libunwind_elf64_la_LIBADD = $(LIBLZMA)
+ am_libunwind_elf64_la_OBJECTS = elf64.lo
+ libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
+ @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
+-libunwind_elfxx_la_LIBADD =
++libunwind_elfxx_la_LIBADD = $(LIBLZMA)
+ am_libunwind_elfxx_la_OBJECTS = elfxx.lo
+ libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
+ @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
+-- 
+1.8.5.5
+
diff --git a/sys-libs/libunwind/libunwind-1.1.ebuild b/sys-libs/libunwind/libunwind-1.1.ebuild
index 288575a93568..4d9e78cb384a 100644
--- a/sys-libs/libunwind/libunwind-1.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.13 2014/02/12 00:31:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.14 2014/02/16 02:12:30 vapier Exp $
 
 EAPI="5"
 
@@ -31,7 +31,8 @@ src_prepare() {
 	echo 'int main(){return 0;}' > tests/Gtest-dyn1.c
 	echo 'int main(){return 0;}' > tests/Ltest-dyn1.c
 
-	sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure{,.ac} || die #444050
+	sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure{.ac,} || die #444050
+	epatch "${FILESDIR}"/${P}-lzma.patch #444050
 	elibtoolize
 }