From 453f7f83f6c7d720f523ee7c726e52f207407d63 Mon Sep 17 00:00:00 2001 From: ziggi Date: Sat, 25 Mar 2023 20:10:20 +0200 Subject: [PATCH] fixed unwind --- devel/libunwind/Makefile | 2 +- .../libunwind/files/patch-x-config-ltmain.sh | 36 ++++++++++++++++++ devel/libunwind/pkg-plist | 38 +++++++++---------- 3 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 devel/libunwind/files/patch-x-config-ltmain.sh diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile index 29ad38e7..104ac872 100644 --- a/devel/libunwind/Makefile +++ b/devel/libunwind/Makefile @@ -11,7 +11,7 @@ WWW= https://www.nongnu.org/libunwind/ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le -USES= compiler:c11 cpe libtool pathfix pkgconfig +USES= compiler:c11 pathfix pkgconfig CONFIGURE_ARGS= --disable-cxx-exceptions \ --disable-unwind-header \ diff --git a/devel/libunwind/files/patch-x-config-ltmain.sh b/devel/libunwind/files/patch-x-config-ltmain.sh new file mode 100644 index 00000000..3e2d4cee --- /dev/null +++ b/devel/libunwind/files/patch-x-config-ltmain.sh @@ -0,0 +1,36 @@ +--- ./config/ltmain.sh.orig 2021-01-09 22:49:30.000000000 +0200 ++++ ./config/ltmain.sh 2023-03-25 20:07:01.612532000 +0200 +@@ -8906,13 +8906,13 @@ + # + case $version_type in + # correct linux to gnu/linux during the next big refactor +- darwin|freebsd-elf|linux|osf|windows|none) ++ darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age=$number_minor + revision=$number_revision + ;; +- freebsd-aout|qnx|sunos) ++ freebsd*|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 +@@ -8995,15 +8995,9 @@ + esac + ;; + +- freebsd-aout) ++ freebsd*) + major=.$current +- versuffix=.$current.$revision +- ;; +- +- freebsd-elf) +- func_arith $current - $age +- major=.$func_arith_result +- versuffix=$major.$age.$revision ++ versuffix=.$current + ;; + + irix | nonstopux) diff --git a/devel/libunwind/pkg-plist b/devel/libunwind/pkg-plist index 73e64822..71171c77 100644 --- a/devel/libunwind/pkg-plist +++ b/devel/libunwind/pkg-plist @@ -1,36 +1,36 @@ include/libunwind-common.h -%%COREDUMP%%include/libunwind-coredump.h +include/libunwind-coredump.h include/libunwind-dynamic.h include/libunwind-ptrace.h -include/libunwind-%%ARCH%%.h +include/libunwind-x86_64.h include/libunwind.h -%%COREDUMP%%lib/libunwind-coredump.a -%%COREDUMP%%lib/libunwind-coredump.so -%%COREDUMP%%lib/libunwind-coredump.so.0 -%%COREDUMP%%lib/libunwind-coredump.so.0.0.0 +lib/libunwind-coredump.a +lib/libunwind-coredump.la +lib/libunwind-coredump.so +lib/libunwind-coredump.so.0 lib/libunwind-generic.a lib/libunwind-generic.so lib/libunwind-ptrace.a +lib/libunwind-ptrace.la lib/libunwind-ptrace.so lib/libunwind-ptrace.so.0 -lib/libunwind-ptrace.so.0.0.0 lib/libunwind-setjmp.a +lib/libunwind-setjmp.la lib/libunwind-setjmp.so lib/libunwind-setjmp.so.0 -lib/libunwind-setjmp.so.0.0.0 -lib/libunwind-%%ARCH%%.a -lib/libunwind-%%ARCH%%.so -lib/libunwind-%%ARCH%%.so.8 -lib/libunwind-%%ARCH%%.so.8.0.1 +lib/libunwind-x86_64.a +lib/libunwind-x86_64.la +lib/libunwind-x86_64.so +lib/libunwind-x86_64.so.8 lib/libunwind.a +lib/libunwind.la lib/libunwind.so lib/libunwind.so.8 -lib/libunwind.so.8.0.1 -%%COREDUMP%%libdata/pkgconfig/libunwind-coredump.pc -libdata/pkgconfig/libunwind-generic.pc -libdata/pkgconfig/libunwind-ptrace.pc -libdata/pkgconfig/libunwind-setjmp.pc -libdata/pkgconfig/libunwind.pc +lib/pkgconfig/libunwind-coredump.pc +lib/pkgconfig/libunwind-generic.pc +lib/pkgconfig/libunwind-ptrace.pc +lib/pkgconfig/libunwind-setjmp.pc +lib/pkgconfig/libunwind.pc man/man3/_U_dyn_cancel.3.gz man/man3/_U_dyn_register.3.gz man/man3/libunwind-dynamic.3.gz @@ -45,8 +45,8 @@ man/man3/unw_destroy_addr_space.3.gz man/man3/unw_flush_cache.3.gz man/man3/unw_get_accessors.3.gz man/man3/unw_get_fpreg.3.gz -man/man3/unw_get_proc_info.3.gz man/man3/unw_get_proc_info_by_ip.3.gz +man/man3/unw_get_proc_info.3.gz man/man3/unw_get_proc_name.3.gz man/man3/unw_get_reg.3.gz man/man3/unw_getcontext.3.gz