Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=efe874b131541f85d730bca41b0a1c9f0c07b0c9
commit efe874b131541f85d730bca41b0a1c9f0c07b0c9 Author: crazy <[email protected]> Date: Sat Jan 2 21:04:57 2016 +0100 libunwind-1.1-4-x86_64 * add patch to fix build .. addpted from gentoo diff --git a/source/lib/libunwind/FrugalBuild b/source/lib/libunwind/FrugalBuild index 19475c0..94a71ec 100644 --- a/source/lib/libunwind/FrugalBuild +++ b/source/lib/libunwind/FrugalBuild @@ -3,16 +3,16 @@ pkgname=libunwind pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Portable and efficient C programming interface (API) to determine the call-chain of a program" url="http://www.nongnu.org/libunwind"; depends=('xz>=5.2.2-3') groups=('lib') archs=('i686' 'x86_64') up2date="Flasttar http://download.savannah.gnu.org/releases/libunwind"; -source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('aa04e6a7164aef754415b3b5e9453985741dd99e') -if [ "$CARCH" == "i686" ]; then - options+=('libtool' 'static') -fi +source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz \ + libunwind-1.1-lzma.patch) +sha1sums=('aa04e6a7164aef754415b3b5e9453985741dd99e' \ + '54aff016af6880e84e358727ea80ae2ce57ee0d4') + # optimization OK diff --git a/source/lib/libunwind/libunwind-1.1-lzma.patch b/source/lib/libunwind/libunwind-1.1-lzma.patch new file mode 100644 index 0000000..410dd2f --- /dev/null +++ b/source/lib/libunwind/libunwind-1.1-lzma.patch @@ -0,0 +1,63 @@ +From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +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 <[email protected]> +--- + 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 = $(pkg-config --libs 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 = $(pkg-config --libs 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 = $(pkg-config --libs 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 = $(pkg-config --libs 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 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
