CVS commit: pkgsrc/lang/libcxxabi

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 13 09:03:55 UTC 2022

Modified Files:
        pkgsrc/lang/libcxxabi: Makefile

Log Message:
libcxxabi: reduce compiler requirement, delint


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/libcxxabi/Makefile

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

Modified files:

Index: pkgsrc/lang/libcxxabi/Makefile
diff -u pkgsrc/lang/libcxxabi/Makefile:1.13 pkgsrc/lang/libcxxabi/Makefile:1.14
--- pkgsrc/lang/libcxxabi/Makefile:1.13 Fri Aug 12 08:41:58 2022
+++ pkgsrc/lang/libcxxabi/Makefile      Sat Aug 13 09:03:55 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2022/08/12 08:41:58 pin Exp $
+# $NetBSD: Makefile,v 1.14 2022/08/13 09:03:55 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
+PKGREVISION=   1
 
 DISTNAME=      libcxxabi-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -17,18 +18,20 @@ LICENSE=    apache-2.0
 # circular dependencies.  This must be kept in sync with libcxxabi/Makefile.
 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_LANGUAGES= c c++
+USE_LANGUAGES= c c++17
 USE_CMAKE=     yes
-GCC_REQD+=     12
 SSP_SUPPORTED= no
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
@@ -40,11 +43,14 @@ CMAKE_ARGS+=        -DLIBCXXABI_USE_LLVM_UNWIND
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
 
+# Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
+CXXFLAGS+=             -std=c++17 -D_LIBCPP_STD_VER=17
+
 post-extract:
-       ${MKDIR} ${WRKDIR}/build
+       ${MKDIR} ${WRKSRC}/build
        ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
        ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
-        # TODO: not sure what should create this and with which contents
+# TODO: not sure what should create this and with which contents
        ${TOUCH} ${WRKDIR}/${LIBCXX}/include/__config_site
 
 .include "../../lang/libunwind/buildlink3.mk"