pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang libcxx & friends: increase GCC_REQD to 10



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7afe4efd8a36
branches:  trunk
changeset: 383181:7afe4efd8a36
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Aug 14 13:52:26 2022 +0000

description:
libcxx & friends: increase GCC_REQD to 10

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

diffstat:

 lang/libcxx/Makefile    |  7 +++++--
 lang/libcxxabi/Makefile |  9 +++++++--
 lang/libunwind/Makefile |  5 +++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (87 lines):

diff -r fa5e618b6743 -r 7afe4efd8a36 lang/libcxx/Makefile
--- a/lang/libcxx/Makefile      Sun Aug 14 13:13:52 2022 +0000
+++ b/lang/libcxx/Makefile      Sun Aug 14 13:52:26 2022 +0000
@@ -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 @@
 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 @@
 # 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
diff -r fa5e618b6743 -r 7afe4efd8a36 lang/libcxxabi/Makefile
--- a/lang/libcxxabi/Makefile   Sun Aug 14 13:13:52 2022 +0000
+++ b/lang/libcxxabi/Makefile   Sun Aug 14 13:52:26 2022 +0000
@@ -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 @@
 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 @@
 # 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
diff -r fa5e618b6743 -r 7afe4efd8a36 lang/libunwind/Makefile
--- a/lang/libunwind/Makefile   Sun Aug 14 13:13:52 2022 +0000
+++ b/lang/libunwind/Makefile   Sun Aug 14 13:52:26 2022 +0000
@@ -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_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}



Home | Main Index | Thread Index | Old Index