CVS commit: pkgsrc/lang/libunwind

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 13 09:00:23 UTC 2022

Modified Files:
        pkgsrc/lang/libunwind: Makefile
Removed Files:
        pkgsrc/lang/libunwind/patches: patch-include_____libunwind__config.h
            patch-src_UnwindRegistersRestore.S patch-src_UnwindRegistersSave.S
            patch-src_config.h patch-src_libunwind.cpp

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


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/libunwind/patches/patch-include_____libunwind__config.h \
    pkgsrc/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S \
    pkgsrc/lang/libunwind/patches/patch-src_UnwindRegistersSave.S \
    pkgsrc/lang/libunwind/patches/patch-src_config.h \
    pkgsrc/lang/libunwind/patches/patch-src_libunwind.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.26 pkgsrc/lang/libunwind/Makefile:1.27
--- pkgsrc/lang/libunwind/Makefile:1.26 Fri Aug 12 08:39:56 2022
+++ pkgsrc/lang/libunwind/Makefile      Sat Aug 13 09:00:23 2022
@@ -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 @@ LICENSE=    apache-2.0
 # 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 @@ CMAKE_ARGS+=        -DCMAKE_CXX_COMPILER=${CXX:
 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