[pkgsrc/trunk]: pkgsrc/lang/libunwind libunwind: reduce compiler requirement,...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d2278c3145c
branches:  trunk
changeset: 383143:8d2278c3145c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Aug 13 09:00:23 2022 +0000

description:
libunwind: reduce compiler requirement, g/c stale patches, delint

diffstat:

 lang/libunwind/Makefile                                      |  20 ++++++-----
 lang/libunwind/patches/patch-include_____libunwind__config.h |  15 ---------
 lang/libunwind/patches/patch-src_UnwindRegistersRestore.S    |  15 ---------
 lang/libunwind/patches/patch-src_UnwindRegistersSave.S       |  15 ---------
 lang/libunwind/patches/patch-src_config.h                    |  15 ---------
 lang/libunwind/patches/patch-src_libunwind.cpp               |  15 ---------
 6 files changed, 11 insertions(+), 84 deletions(-)

diffs (149 lines):

diff -r 78ee40227fb8 -r 8d2278c3145c lang/libunwind/Makefile
--- a/lang/libunwind/Makefile   Sat Aug 13 08:59:32 2022 +0000
+++ b/lang/libunwind/Makefile   Sat Aug 13 09:00:23 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2022/08/12 08:39:56 pin Exp $
+# $NetBSD: Makefile,v 1.27 2022/08/13 09:00:23 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
+PKGREVISION=   1
 
 DISTNAME=      libunwind-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -14,19 +15,21 @@
 # libunwind requires llvm and libcxx source code to build
 LIBCXX=                libcxx-${LLVM_VERSION}.src
 LLVMDIST=      llvm-${LLVM_VERSION}.src
-_EXTRA_DIST=   ${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
-SITES.${LIBCXX}${EXTRACT_SUFX}=                ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=     ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
+EXTRA_DIST=    ${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
 
-DISTFILES=     ${DEFAULT_DISTFILES} ${_EXTRA_DIST}
+SITES.${LIBCXX}${EXTRACT_SUFX}=        \
+       ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
+SITES.${LLLVMDIST}${EXTRACT_SUFX}=     \
+       ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-CONFIGURE_DIRS=        ${WRKDIR}/build
+DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
+
+CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ${WRKSRC}
 
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++11
 USE_TOOLS+=            pax
-GCC_REQD+=             12
 SSP_SUPPORTED=         no
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
@@ -36,12 +39,11 @@
 INSTALLATION_DIRS=     include
 
 post-extract:
-       ${MKDIR} ${WRKDIR}/build
+       ${MKDIR} ${WRKSRC}/build
        ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
        ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
 
 post-install:
-       ${RM} -f ${WRKSRC}/include/__libunwind_config.h.orig
        cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include
 
 BUILDLINK_DEPMETHOD.llvm=      build
diff -r 78ee40227fb8 -r 8d2278c3145c lang/libunwind/patches/patch-include_____libunwind__config.h
--- a/lang/libunwind/patches/patch-include_____libunwind__config.h      Sat Aug 13 08:59:32 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_____libunwind__config.h,v 1.1 2020/10/18 17:06:35 he Exp $
-
-Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
-
---- include/__libunwind_config.h.orig  2020-07-07 16:21:37.000000000 +0000
-+++ include/__libunwind_config.h
-@@ -50,7 +50,7 @@
- #  define _LIBUNWIND_CONTEXT_SIZE 167
- #  define _LIBUNWIND_CURSOR_SIZE 179
- #  define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64
--# elif defined(__ppc__)
-+# elif defined(__ppc__) || defined(__powerpc__)
- #  define _LIBUNWIND_TARGET_PPC 1
- #  define _LIBUNWIND_CONTEXT_SIZE 117
- #  define _LIBUNWIND_CURSOR_SIZE 124
diff -r 78ee40227fb8 -r 8d2278c3145c lang/libunwind/patches/patch-src_UnwindRegistersRestore.S
--- a/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S Sat Aug 13 08:59:32 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_UnwindRegistersRestore.S,v 1.1 2020/10/18 17:06:35 he Exp $
-
-Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
-
---- src/UnwindRegistersRestore.S.orig  2020-07-07 16:21:37.000000000 +0000
-+++ src/UnwindRegistersRestore.S
-@@ -392,7 +392,7 @@ Lnovec:
-   PPC64_LR(3)
-   bctr
- 
--#elif defined(__ppc__)
-+#elif defined(__ppc__) || defined(__powerpc__)
- 
- DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
- //
diff -r 78ee40227fb8 -r 8d2278c3145c lang/libunwind/patches/patch-src_UnwindRegistersSave.S
--- a/lang/libunwind/patches/patch-src_UnwindRegistersSave.S    Sat Aug 13 08:59:32 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_UnwindRegistersSave.S,v 1.1 2020/10/18 17:06:35 he Exp $
-
-Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
-
---- src/UnwindRegistersSave.S.orig     2020-07-07 16:21:37.000000000 +0000
-+++ src/UnwindRegistersSave.S
-@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getconte
-   blr
- 
- 
--#elif defined(__ppc__)
-+#elif defined(__ppc__) || defined(__powerpc__)
- 
- //
- // extern int unw_getcontext(unw_context_t* thread_state)
diff -r 78ee40227fb8 -r 8d2278c3145c lang/libunwind/patches/patch-src_config.h
--- a/lang/libunwind/patches/patch-src_config.h Sat Aug 13 08:59:32 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_config.h,v 1.1 2020/10/18 17:06:35 he Exp $
-
-Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
-
---- src/config.h.orig  2020-07-07 16:21:37.000000000 +0000
-+++ src/config.h
-@@ -95,7 +95,7 @@
- #define _LIBUNWIND_BUILD_SJLJ_APIS
- #endif
- 
--#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__)
- #define _LIBUNWIND_SUPPORT_FRAME_APIS
- #endif
- 
diff -r 78ee40227fb8 -r 8d2278c3145c lang/libunwind/patches/patch-src_libunwind.cpp
--- a/lang/libunwind/patches/patch-src_libunwind.cpp    Sat Aug 13 08:59:32 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libunwind.cpp,v 1.1 2020/10/18 17:06:35 he Exp $
-
-Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
-
---- src/libunwind.cpp.orig     2020-07-07 16:21:37.000000000 +0000
-+++ src/libunwind.cpp
-@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(u
- # define REGISTER_KIND Registers_x86_64
- #elif defined(__powerpc64__)
- # define REGISTER_KIND Registers_ppc64
--#elif defined(__ppc__)
-+#elif defined(__ppc__) || defined(__powerpc__)
- # define REGISTER_KIND Registers_ppc
- #elif defined(__aarch64__)
- # define REGISTER_KIND Registers_arm64