Page MenuHomeFreeBSD

D35327.diff
No OneTemporary

D35327.diff

Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -52,6 +52,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 2022mmdd: libc++ shlib bumped to version 2 for new std::pair ABI
+OLD_LIBS+=lib/libc++.so.1
+
# 20220524: libkqueue test updates
OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest
Index: contrib/llvm-project/libcxx/include/__config
===================================================================
--- contrib/llvm-project/libcxx/include/__config
+++ contrib/llvm-project/libcxx/include/__config
@@ -129,7 +129,7 @@
# endif
// Feature macros for disabling pre ABI v1 features. All of these options
// are deprecated.
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) && __FreeBSD__ < 14
# define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
# endif
#endif
Index: lib/libc++/Makefile
===================================================================
--- lib/libc++/Makefile
+++ lib/libc++/Makefile
@@ -13,7 +13,7 @@
.PATH: ${SRCDIR}
LIB= c++
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SHLIB_LDSCRIPT= libc++.ldscript
SRCS+= algorithm.cpp
Index: sys/sys/param.h
===================================================================
--- sys/sys/param.h
+++ sys/sys/param.h
@@ -76,7 +76,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1400059
+#define __FreeBSD_version 1400060
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 7:51 PM (18 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16161587
Default Alt Text
D35327.diff (1 KB)

Event Timeline