diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-06-05 23:27:13 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-06-05 23:27:13 -0500 |
| commit | 85077a06712b42ab4cbeb0575bdec23fce5f37bb (patch) | |
| tree | 1c8e97a555be337066fc1578407663902d1d9744 | |
| parent | 20ca018cff2138baba27b01907b738e216ff9c55 (diff) | |
| download | aports-85077a06712b42ab4cbeb0575bdec23fce5f37bb.tar.bz2 aports-85077a06712b42ab4cbeb0575bdec23fce5f37bb.tar.xz | |
main/libc0.9.32: bring libubacktrace in as needed when linking to libc.so
| -rw-r--r-- | main/libc0.9.32/APKBUILD | 4 | ||||
| -rw-r--r-- | main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch | 22 |
2 files changed, 25 insertions, 1 deletions
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 2de7b246fc..930093251b 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -4,7 +4,7 @@ pkgname=libc$_abiver _gitver= pkgver=0.9.32_rc3 _ver=${pkgver/_/-} -pkgrel=12 +pkgrel=13 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -33,6 +33,7 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 0001-posix_fadvise64-fix-x86-implementation.patch 0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch uclibc-generic-backtrace.patch + uclibc-ubacktrace-asneeded-fix.patch uclibcconfig.x86 uclibcconfig.x86_64 uclibcconfig.i486 @@ -138,6 +139,7 @@ b4fb68ad3d0e8331b1b40c30eb21dfdc 0002-stdlib-fix-arc4random-return-type-to-u_in 100d026c2d7cf7fc5906229448c791d4 0001-posix_fadvise64-fix-x86-implementation.patch 2548d9f470c9a5b2c117ec3d6f35c105 0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch 871956085df0bf90f4054e294a3770ce uclibc-generic-backtrace.patch +814ae23243116cf61690218b9b6019f6 uclibc-ubacktrace-asneeded-fix.patch 35ef159d3c56ad67f520ab033e0f6930 uclibcconfig.x86 a0b00fb82825f91671b76b1d8f979944 uclibcconfig.x86_64 35ef159d3c56ad67f520ab033e0f6930 uclibcconfig.i486 diff --git a/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch b/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch new file mode 100644 index 0000000000..7ac85a03f3 --- /dev/null +++ b/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch @@ -0,0 +1,22 @@ +--- uClibc-0.9.32-rc3.orig/Makefile.in ++++ uClibc-0.9.32-rc3/Makefile.in +@@ -336,7 +336,7 @@ + endif + ifeq ($(UCLIBC_HAS_BACKTRACE),y) + # Add the AS_NEEDED entry for libubacktrace.so +- if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME) ] ; then \ ++ if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so ] ; then \ + echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ + fi + endif +--- uClibc-0.9.32-rc3.orig/Rules.mak ++++ uClibc-0.9.32-rc3/Rules.mak +@@ -118,7 +118,7 @@ + + LIBC := libc + SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) +-UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION) ++UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) + ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) + UCLIBC_LDSO_NAME := ld64-uClibc + ARCH_NATIVE_BIT := 64 |