diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2021-01-11 15:27:22 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2021-01-11 15:27:22 +0000 |
| commit | adf4c9d5662cba4c73ee8532a92cc7cead54213a (patch) | |
| tree | f9542ecdeafebc6a353db101dc1b790aaa3f2303 /gnu | |
| parent | 9e13e9419bacbab0ba7ca1e5887778202cb4815d (diff) | |
Switch libc++ and libc++abi to version 10.0.1.
Further libc++ header fixes for ports thanks to kettenis@
Ports build test and fixes thanks to naddy@
"Startschuss!" naddy@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libcxx/Makefile | 23 | ||||
| -rw-r--r-- | gnu/lib/libcxx/shlib_version | 2 | ||||
| -rw-r--r-- | gnu/lib/libcxxabi/Makefile | 8 | ||||
| -rw-r--r-- | gnu/lib/libcxxabi/shlib_version | 2 |
4 files changed, 15 insertions, 20 deletions
diff --git a/gnu/lib/libcxx/Makefile b/gnu/lib/libcxx/Makefile index a31dfa0d7c6..2bd77ed4c1f 100644 --- a/gnu/lib/libcxx/Makefile +++ b/gnu/lib/libcxx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2021/01/02 20:43:26 patrick Exp $ +# $OpenBSD: Makefile,v 1.3 2021/01/11 15:27:21 patrick Exp $ .include <bsd.own.mk> @@ -9,9 +9,9 @@ CXX= clang++ .if ${BUILD_CLANG:L} == "yes" -HDRDIR= ${.CURDIR}/../../../lib/libcxx/include -SRCDIR= ${.CURDIR}/../../../lib/libcxx/src -AHDRDIR= ${.CURDIR}/../../../lib/libcxxabi/include +HDRDIR= ${.CURDIR}/../../../gnu/llvm/libcxx/include +SRCDIR= ${.CURDIR}/../../../gnu/llvm/libcxx/src +AHDRDIR= ${.CURDIR}/../../../gnu/llvm/libcxxabi/include UHDRDIR= ${.CURDIR}/../../../gnu/llvm/libunwind/include CXXINCLUDEDIR= /usr/include/c++/v1 @@ -26,6 +26,7 @@ SRCS+= algorithm.cpp \ charconv.cpp \ chrono.cpp \ condition_variable.cpp \ + condition_variable_destructor.cpp \ debug.cpp \ directory_iterator.cpp \ exception.cpp \ @@ -37,6 +38,7 @@ SRCS+= algorithm.cpp \ locale.cpp \ memory.cpp \ mutex.cpp \ + mutex_destructor.cpp \ new.cpp \ operations.cpp \ optional.cpp \ @@ -130,7 +132,9 @@ STD_HEADERS= __bit_reference \ deque \ errno.h \ exception \ + execution \ filesystem \ + fenv.h \ float.h \ forward_list \ fstream \ @@ -215,8 +219,6 @@ EXTDIR= ${CXXINCLUDEDIR}/ext EXP_HEADERS= __config \ __memory \ algorithm \ - any \ - chrono \ coroutine \ deque \ filesystem \ @@ -226,17 +228,11 @@ EXP_HEADERS= __config \ list \ map \ memory_resource \ - numeric \ - optional \ propagate_const \ - ratio \ regex \ set \ simd \ string \ - string_view \ - system_error \ - tuple \ utility \ type_traits \ unordered_map \ @@ -250,8 +246,7 @@ EXPDIR= ${CXXINCLUDEDIR}/experimental XLOCALE_HEADERS= __nop_locale_mgmt.h\ __posix_l_fallback.h\ - __strtonum_fallback.h\ - xlocale.h + __strtonum_fallback.h .for hdr in ${XLOCALE_HEADERS} XLOCALE+= ${hdr} ${HDRDIR}/support/xlocale/${hdr} diff --git a/gnu/lib/libcxx/shlib_version b/gnu/lib/libcxx/shlib_version index 9c1551636c5..5b844bbf422 100644 --- a/gnu/lib/libcxx/shlib_version +++ b/gnu/lib/libcxx/shlib_version @@ -1,2 +1,2 @@ -major=6 +major=7 minor=0 diff --git a/gnu/lib/libcxxabi/Makefile b/gnu/lib/libcxxabi/Makefile index e55ff595da1..f52ea018846 100644 --- a/gnu/lib/libcxxabi/Makefile +++ b/gnu/lib/libcxxabi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2021/01/02 20:04:36 patrick Exp $ +# $OpenBSD: Makefile,v 1.2 2021/01/11 15:27:21 patrick Exp $ .include <bsd.own.mk> @@ -9,9 +9,9 @@ CXX= clang++ .if ${BUILD_CLANG:L} == "yes" -HDRDIR= ${.CURDIR}/../../../lib/libcxxabi/include -SRCDIR= ${.CURDIR}/../../../lib/libcxxabi/src -SHDRDIR= ${.CURDIR}/../../../lib/libcxx/include +HDRDIR= ${.CURDIR}/../../../gnu/llvm/libcxxabi/include +SRCDIR= ${.CURDIR}/../../../gnu/llvm/libcxxabi/src +SHDRDIR= ${.CURDIR}/../../../gnu/llvm/libcxx/include UHDRDIR= ${.CURDIR}/../../../gnu/llvm/libunwind/include CXXINCLUDEDIR= /usr/include/c++/v1 diff --git a/gnu/lib/libcxxabi/shlib_version b/gnu/lib/libcxxabi/shlib_version index 9b77ea1766d..7f748745dab 100644 --- a/gnu/lib/libcxxabi/shlib_version +++ b/gnu/lib/libcxxabi/shlib_version @@ -1,3 +1,3 @@ # Don't forget to give libc++ the same type of bump! -major=4 +major=5 minor=0 |