CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 14 13:52:27 UTC 2022

Modified Files:
        pkgsrc/lang/libcxx: Makefile
        pkgsrc/lang/libcxxabi: Makefile
        pkgsrc/lang/libunwind: Makefile

Log Message:
libcxx & friends: increase GCC_REQD to 10

> Target "cxx_static" requires the language dialect "CXX20".


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/libcxx/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/libcxxabi/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/libunwind/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/libcxx/Makefile
diff -u pkgsrc/lang/libcxx/Makefile:1.13 pkgsrc/lang/libcxx/Makefile:1.14
--- pkgsrc/lang/libcxx/Makefile:1.13    Sat Aug 13 09:38:09 2022
+++ pkgsrc/lang/libcxx/Makefile Sun Aug 14 13:52:26 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/08/13 09:38:09 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2022/08/14 13:52:26 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 PKGREVISION=   1
@@ -30,9 +30,10 @@ DISTFILES=   ${DEFAULT_DISTFILES} ${EXTRA_
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ${WRKSRC}
 
-USE_LANGUAGES= c c++17
+USE_LANGUAGES= c c++20
 USE_CMAKE=     yes
 SSP_SUPPORTED= no
+GCC_REQD+=     10
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
@@ -46,8 +47,10 @@ CMAKE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
 
+.if !empty(CC_VERSION:Mgcc-[0-9].*) || !empty(CC_VERSION:Mgcc-10.*)
 # Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
 CXXFLAGS+=             -std=c++17 -D_LIBCPP_STD_VER=17
+.endif
 
 post-extract:
        ${MKDIR} ${WRKSRC}/build

Index: pkgsrc/lang/libcxxabi/Makefile
diff -u pkgsrc/lang/libcxxabi/Makefile:1.14 pkgsrc/lang/libcxxabi/Makefile:1.15
--- pkgsrc/lang/libcxxabi/Makefile:1.14 Sat Aug 13 09:03:55 2022
+++ pkgsrc/lang/libcxxabi/Makefile      Sun Aug 14 13:52:26 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2022/08/13 09:03:55 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2022/08/14 13:52:26 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
-PKGREVISION=   1
+PKGREVISION=   2
 
 DISTNAME=      libcxxabi-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -33,6 +33,7 @@ CMAKE_ARG_PATH=       ${WRKSRC}
 USE_LANGUAGES= c c++17
 USE_CMAKE=     yes
 SSP_SUPPORTED= no
+GCC_REQD+=     10      # must be in sync with libcxx
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
@@ -43,8 +44,12 @@ CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWIND
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
 
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-[0-9].*) || !empty(CC_VERSION:Mgcc-10.*)
 # Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
 CXXFLAGS+=             -std=c++17 -D_LIBCPP_STD_VER=17
+.endif
 
 post-extract:
        ${MKDIR} ${WRKSRC}/build

Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.27 pkgsrc/lang/libunwind/Makefile:1.28
--- pkgsrc/lang/libunwind/Makefile:1.27 Sat Aug 13 09:00:23 2022
+++ pkgsrc/lang/libunwind/Makefile      Sun Aug 14 13:52:27 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2022/08/13 09:00:23 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2022/08/14 13:52:27 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
-PKGREVISION=   1
+PKGREVISION=   2
 
 DISTNAME=      libunwind-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -31,6 +31,7 @@ USE_CMAKE=            yes
 USE_LANGUAGES=         c c++11
 USE_TOOLS+=            pax
 SSP_SUPPORTED=         no
+GCC_REQD+=             10      # must be in sync with libcxx
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}