diff options
author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-11-10 18:42:33 -0500 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-11-11 19:38:57 +0000 |
commit | 1733d893cb3738b0627295050646aeefb0e4bd62 (patch) | |
tree | 40d7dbcd57027bae9eb10925742d7721fa6e02c5 | |
parent | 0e335adf527050437b2a91897d1a6a47794646d9 (diff) |
main/libunwind: upgrade to 1.5.0
fix-test-coredump-unwind.patch: upstreamed
fix-libunwind-pc-in.patch: rebased
fix-aarch64-sigset_t.patch: upstreamed
-rw-r--r-- | main/libunwind/APKBUILD | 10 | ||||
-rw-r--r-- | main/libunwind/fix-aarch64-sigset_t.patch | 21 | ||||
-rw-r--r-- | main/libunwind/fix-libunwind-pc-in.patch | 2 | ||||
-rw-r--r-- | main/libunwind/fix-test-coredump-unwind.patch | 24 |
4 files changed, 4 insertions, 53 deletions
diff --git a/main/libunwind/APKBUILD b/main/libunwind/APKBUILD index 5e5ecc09d4f..395f0968e89 100644 --- a/main/libunwind/APKBUILD +++ b/main/libunwind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ben Pye <ben@curlybracket.co.uk> # Maintainer: Ben Pye <ben@curlybracket.co.uk> pkgname=libunwind -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=0 pkgdesc="Portable and efficient C programming interface (API) to determine the call-chain of a program" url="https://www.nongnu.org/libunwind/" @@ -16,9 +16,7 @@ source="https://download.savannah.gnu.org/releases/libunwind/libunwind-$pkgver.t musl-mips-fix.patch ppc64-musl.patch fix-ppc64-libdir.patch - fix-test-coredump-unwind.patch fix-libunwind-pc-in.patch - fix-aarch64-sigset_t.patch " prepare() { @@ -47,11 +45,9 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="60bce1e840f071d3a48cfa8e2acff988977956f659c5c04ce83f00751348fbbeddbfc54e8c9bd6ebc9073423ca5ee1816655dc5aa59fefd0a8edc9c3f7f3b913 libunwind-1.4.0.tar.gz +sha512sums="1df20ca7a8cee2f2e61294fa9b677e88fec52e9d5a329f88d05c2671c69fa462f6c18808c97ca9ff664ef57292537a844f00b18d142b1938c9da701ca95a4bab libunwind-1.5.0.tar.gz de3cefd8a2fa9ae3eabf052cb94a1fdde4f9b7e85af839220592269f7a885470572f67ecf6d773129de8d82916fbcbdda44b541f4eeec84744c54f230c36b6a1 force-enable-man.patch a1751b80f2c42a741f0a7778f758c7afe42653bf61a353edf38182d731008ed7bd0b8a41bf466aa83275b22241bfcd4f6051055489e3cc87fcd7dd4488bc089d musl-mips-fix.patch 3b59620c758784faa6d66c8a0a2e49ced743b7ebff6a7e461e40aea653ef9f8cbd8948fb766c63acdd625cb506601c102f133074cef9ef150e9bb8b81584fe9d ppc64-musl.patch 8b66dc1d62e9fd120d136daed743c294d3d586b3da9c527fb65accc3db4fe810e87a176f0a0134c43d913cc33ddfb634039842a289c132a087f3700ee407fe50 fix-ppc64-libdir.patch -7be9e5118f96ea7c344572cb5146f1711cde23eaaf5e72bb17f1fc752d22cf022e56b42747ba8003ec9e141d14cc0c650a7e2a2df3999c66acc4833dbb3df6fc fix-test-coredump-unwind.patch -68f7e28c6eb6560ebb2e26737913bff9c9f868ec89e2ad0682516e1c78e98698c73d40d6a3765290df2e1280e00c5691f0d8c21cb15263ad8e513f607906ca76 fix-libunwind-pc-in.patch -f9bfd1749610a89065fa530aab1e793064691f0cbd84bd54900df286dd23ece1dfdeb6229624fa5a101809be75d91f380eac3de4edf865bf0adaf77299cc84c1 fix-aarch64-sigset_t.patch" +52b568846db7adb50a181f17635e53c8a6d99d6d13c3d35fd8c9a5de5ec0a1ad18d8462c4ae4483d413d4b5aa7375017c36b5cb49805b6f67d96cffafbd02548 fix-libunwind-pc-in.patch" diff --git a/main/libunwind/fix-aarch64-sigset_t.patch b/main/libunwind/fix-aarch64-sigset_t.patch deleted file mode 100644 index 7abc61c41a9..00000000000 --- a/main/libunwind/fix-aarch64-sigset_t.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h -index 778b436..926fbbc 100644 ---- a/include/libunwind-aarch64.h -+++ b/include/libunwind-aarch64.h -@@ -34,6 +34,7 @@ extern "C" { - #include <inttypes.h> - #include <stddef.h> - #include <ucontext.h> -+#include <signal.h> - - #define UNW_TARGET aarch64 - #define UNW_TARGET_AARCH64 1 -@@ -192,7 +193,7 @@ typedef struct - unsigned long uc_flags; - struct ucontext *uc_link; - stack_t uc_stack; -- __sigset_t uc_sigmask; -+ sigset_t uc_sigmask; - struct unw_sigcontext uc_mcontext; - } unw_tdep_context_t; - diff --git a/main/libunwind/fix-libunwind-pc-in.patch b/main/libunwind/fix-libunwind-pc-in.patch index ce93df4fad0..5053013f7cb 100644 --- a/main/libunwind/fix-libunwind-pc-in.patch +++ b/main/libunwind/fix-libunwind-pc-in.patch @@ -6,5 +6,5 @@ Version: @VERSION@ -Libs: -L${libdir} -lunwind +Libs: -L${libdir} -lunwind -lucontext - Libs.private: @LIBLZMA@ + Libs.private: @LIBLZMA@ @LIBZ@ Cflags: -I${includedir} diff --git a/main/libunwind/fix-test-coredump-unwind.patch b/main/libunwind/fix-test-coredump-unwind.patch deleted file mode 100644 index ff3bc5a87df..00000000000 --- a/main/libunwind/fix-test-coredump-unwind.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/tests/test-coredump-unwind.c -+++ b/tests/test-coredump-unwind.c -@@ -57,7 +57,11 @@ - #include <grp.h> - - /* For SIGSEGV handler code */ --#include <execinfo.h> -+#if HAVE_EXECINFO_H -+# include <execinfo.h> -+#else -+ extern int backtrace (void **, int); -+#endif - #include <sys/ucontext.h> - - #include <libunwind-coredump.h> -@@ -242,7 +246,7 @@ - void *array[50]; - int size; - size = backtrace(array, 50); --#ifdef __linux__ -+#if defined __linux__ && HAVE_EXECINFO_H - backtrace_symbols_fd(array, size, 2); - #endif - } |