Module Name: src
Committed By: joerg
Date: Sat Apr 27 23:02:22 UTC 2013
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/etc/mtree: NetBSD.dist.base
src/lib: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/bsd/libc++: Makefile Makefile.inc
src/external/bsd/libc++/include: Makefile
src/external/bsd/libc++/lib: Makefile shlib_version
Log Message:
Add build glue for libc++.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/distrib/sets/sets.subr
cvs rdiff -u -r1.127 -r1.128 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.204 -r1.205 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.191 -r1.192 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.1028 -r1.1029 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.663 -r1.664 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.167 -r1.168 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1817 -r1.1818 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.247 -r1.248 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.118 -r1.119 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r0 -r1.1 src/external/bsd/libc++/Makefile \
src/external/bsd/libc++/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/libc++/include/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/libc++/lib/Makefile \
src/external/bsd/libc++/lib/shlib_version
cvs rdiff -u -r1.201 -r1.202 src/lib/Makefile
cvs rdiff -u -r1.726 -r1.727 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.145 src/distrib/sets/sets.subr:1.146
--- src/distrib/sets/sets.subr:1.145 Wed Feb 27 21:25:05 2013
+++ src/distrib/sets/sets.subr Sat Apr 27 23:02:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.145 2013/02/27 21:25:05 joerg Exp $
+# $NetBSD: sets.subr,v 1.146 2013/04/27 23:02:17 joerg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.145 2013/02/27 21:25:05 joerg Exp $
+# # $NetBSD: sets.subr,v 1.146 2013/04/27 23:02:17 joerg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -228,6 +228,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# kyua ${MKKYUA} != no
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
+# libcxx ${MKLIBCXX} != no
# llvm ${MKLLVM} != no
# lvm ${MKLVM} != no
# makemandb ${MKMAKEMANDB} != no
Index: src/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.127 src/distrib/sets/lists/base/ad.mips64eb:1.128
--- src/distrib/sets/lists/base/ad.mips64eb:1.127 Mon Apr 15 19:26:15 2013
+++ src/distrib/sets/lists/base/ad.mips64eb Sat Apr 27 23:02:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.127 2013/04/15 19:26:15 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.128 2013/04/27 23:02:17 joerg Exp $
./lib/64 base-compat-shlib compat
./lib/64/npf base-npf-shlib compat
./lib/64/npf/ext_log.so base-npf-shlib compat,pic
@@ -95,6 +95,8 @@
./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libc.so.12 base-compat-shlib compat,pic
./usr/lib/64/libc.so.12.185 base-compat-shlib compat,pic
+./usr/lib/64/libc++.so.1 base-compat-shlib compat,pic,libcxx
+./usr/lib/64/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic
@@ -421,6 +423,8 @@
./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic
./usr/lib/o32/libc.so.12.185 base-compat-shlib compat,pic
+./usr/lib/o32/libc++.so.1 base-compat-shlib compat,pic,libcxx
+./usr/lib/o32/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.126 src/distrib/sets/lists/base/ad.mips64el:1.127
--- src/distrib/sets/lists/base/ad.mips64el:1.126 Thu Apr 11 17:43:15 2013
+++ src/distrib/sets/lists/base/ad.mips64el Sat Apr 27 23:02:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.126 2013/04/11 17:43:15 christos Exp $
+# $NetBSD: ad.mips64el,v 1.127 2013/04/27 23:02:17 joerg Exp $
./lib/64 base-compat-shlib compat
./lib/64/npf base-npf-shlib compat
./lib/64/npf/ext_log.so base-npf-shlib compat,pic
@@ -93,6 +93,8 @@
./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libc.so.12 base-compat-shlib compat,pic
./usr/lib/64/libc.so.12.185 base-compat-shlib compat,pic
+./usr/lib/64/libc++.so.1 base-compat-shlib compat,pic,libcxx
+./usr/lib/64/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic
@@ -421,6 +423,8 @@
./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic
./usr/lib/o32/libc.so.12.185 base-compat-shlib compat,pic
+./usr/lib/o32/libc++.so.1 base-compat-shlib compat,pic,libcxx
+./usr/lib/o32/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.204 src/distrib/sets/lists/base/md.amd64:1.205
--- src/distrib/sets/lists/base/md.amd64:1.204 Thu Apr 11 17:43:16 2013
+++ src/distrib/sets/lists/base/md.amd64 Sat Apr 27 23:02:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.204 2013/04/11 17:43:16 christos Exp $
+# $NetBSD: md.amd64,v 1.205 2013/04/27 23:02:17 joerg Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./lib/i386 base-compat-shlib compat
@@ -85,6 +85,8 @@
./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic
./usr/lib/i386/libc.so.12.185 base-compat-shlib compat,pic
+./usr/lib/i386/libc++.so.1 base-compat-shlib compat,pic,libcxx
+./usr/lib/i386/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/i386/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.191 src/distrib/sets/lists/base/md.sparc64:1.192
--- src/distrib/sets/lists/base/md.sparc64:1.191 Thu Apr 11 17:43:16 2013
+++ src/distrib/sets/lists/base/md.sparc64 Sat Apr 27 23:02:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.191 2013/04/11 17:43:16 christos Exp $
+# $NetBSD: md.sparc64,v 1.192 2013/04/27 23:02:17 joerg Exp $
./lib/sparc base-npf-shlib compat
./lib/sparc/npf base-npf-shlib compat
./lib/sparc/npf/ext_log.so base-npf-shlib compat,pic
@@ -83,6 +83,8 @@
./usr/lib/sparc/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/sparc/libc.so.12 base-compat-shlib compat,pic
./usr/lib/sparc/libc.so.12.185 base-compat-shlib compat,pic
+./usr/lib/sparc/libc++.so.1 base-compat-shlib compat,pic,libcxx
+./usr/lib/sparc/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/sparc/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1028 src/distrib/sets/lists/base/mi:1.1029
--- src/distrib/sets/lists/base/mi:1.1028 Thu Apr 11 17:43:16 2013
+++ src/distrib/sets/lists/base/mi Sat Apr 27 23:02:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1028 2013/04/11 17:43:16 christos Exp $
+# $NetBSD: mi,v 1.1029 2013/04/27 23:02:17 joerg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -803,6 +803,8 @@
./usr/include/adosfs base-c-usr
./usr/include/altq base-c-usr
./usr/include/arpa base-c-usr
+./usr/include/c++ base-cxx-usr
+./usr/include/c++/ext base-cxx-usr
./usr/include/cdk base-obsolete obsolete
./usr/include/clang-3.0 base-obsolete obsolete
./usr/include/clang-3.2 base-obsolete obsolete
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.663 src/distrib/sets/lists/base/shl.mi:1.664
--- src/distrib/sets/lists/base/shl.mi:1.663 Thu Apr 11 17:43:16 2013
+++ src/distrib/sets/lists/base/shl.mi Sat Apr 27 23:02:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.663 2013/04/11 17:43:16 christos Exp $
+# $NetBSD: shl.mi,v 1.664 2013/04/27 23:02:18 joerg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -195,6 +195,9 @@
./usr/lib/libc.so base-sys-shlib
./usr/lib/libc.so.12 base-sys-shlib
./usr/lib/libc.so.12.185 base-sys-shlib
+./usr/lib/libc++.so base-sys-shlib libcxx
+./usr/lib/libc++.so.1 base-sys-shlib libcxx
+./usr/lib/libc++.so.1.0 base-sys-shlib libcxx
./usr/lib/libcdk.so base-obsolete obsolete
./usr/lib/libcom_err.so base-krb5-shlib kerberos
./usr/lib/libcom_err.so.7 base-krb5-shlib kerberos
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.100 src/distrib/sets/lists/comp/ad.mips64eb:1.101
--- src/distrib/sets/lists/comp/ad.mips64eb:1.100 Thu Apr 11 17:43:17 2013
+++ src/distrib/sets/lists/comp/ad.mips64eb Sat Apr 27 23:02:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.100 2013/04/11 17:43:17 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.101 2013/04/27 23:02:18 joerg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -203,6 +203,10 @@
./usr/lib/64/libc.so base-sys-shlib compat,pic
./usr/lib/64/libc_p.a comp-c-proflib compat,profile
./usr/lib/64/libc_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libc++.a comp-c-lib compat,libcxx
+./usr/lib/64/libc++.so comp-sys-shlib compat,pic,libcxx
+./usr/lib/64/libc++_p.a comp-c-proflib compat,profile,libcxx
+./usr/lib/64/libc++_pic.a comp-c-piclib compat,pic,libcxx
./usr/lib/64/libcom_err.a comp-c-lib compat,kerberos
./usr/lib/64/libcom_err.so base-sys-shlib compat,pic,kerberos
./usr/lib/64/libcom_err_p.a comp-c-proflib compat,profile,kerberos
@@ -810,6 +814,10 @@
./usr/lib/o32/libc.so base-sys-shlib compat,pic
./usr/lib/o32/libc_p.a comp-c-proflib compat,profile
./usr/lib/o32/libc_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libc++.a comp-c-lib compat,libcxx
+./usr/lib/o32/libc++.so comp-sys-shlib compat,pic,libcxx
+./usr/lib/o32/libc++_p.a comp-c-proflib compat,profile,libcxx
+./usr/lib/o32/libc++_pic.a comp-c-piclib compat,pic,libcxx
./usr/lib/o32/libcom_err.a comp-c-lib compat,kerberos
./usr/lib/o32/libcom_err.so base-sys-shlib compat,pic,kerberos
./usr/lib/o32/libcom_err_p.a comp-c-proflib compat,profile,kerberos
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.102 src/distrib/sets/lists/comp/ad.mips64el:1.103
--- src/distrib/sets/lists/comp/ad.mips64el:1.102 Thu Apr 11 17:43:17 2013
+++ src/distrib/sets/lists/comp/ad.mips64el Sat Apr 27 23:02:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.102 2013/04/11 17:43:17 christos Exp $
+# $NetBSD: ad.mips64el,v 1.103 2013/04/27 23:02:19 joerg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -203,6 +203,10 @@
./usr/lib/64/libc.so base-sys-shlib compat,pic
./usr/lib/64/libc_p.a comp-c-proflib compat,profile
./usr/lib/64/libc_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libc++.a comp-c-lib compat,libcxx
+./usr/lib/64/libc++.so comp-sys-shlib compat,pic,libcxx
+./usr/lib/64/libc++_p.a comp-c-proflib compat,profile,libcxx
+./usr/lib/64/libc++_pic.a comp-c-piclib compat,pic,libcxx
./usr/lib/64/libcom_err.a comp-c-lib compat,kerberos
./usr/lib/64/libcom_err.so base-sys-shlib compat,pic,kerberos
./usr/lib/64/libcom_err_p.a comp-c-proflib compat,profile,kerberos
@@ -810,6 +814,10 @@
./usr/lib/o32/libc.so base-sys-shlib compat,pic
./usr/lib/o32/libc_p.a comp-c-proflib compat,profile
./usr/lib/o32/libc_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libc++.a comp-c-lib compat,libcxx
+./usr/lib/o32/libc++.so comp-sys-shlib compat,pic,libcxx
+./usr/lib/o32/libc++_p.a comp-c-proflib compat,profile,libcxx
+./usr/lib/o32/libc++_pic.a comp-c-piclib compat,pic,libcxx
./usr/lib/o32/libcom_err.a comp-c-lib compat,kerberos
./usr/lib/o32/libcom_err.so base-sys-shlib compat,pic,kerberos
./usr/lib/o32/libcom_err_p.a comp-c-proflib compat,profile,kerberos
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.194 src/distrib/sets/lists/comp/md.amd64:1.195
--- src/distrib/sets/lists/comp/md.amd64:1.194 Thu Apr 25 13:59:54 2013
+++ src/distrib/sets/lists/comp/md.amd64 Sat Apr 27 23:02:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.194 2013/04/25 13:59:54 joerg Exp $
+# $NetBSD: md.amd64,v 1.195 2013/04/27 23:02:19 joerg Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -487,6 +487,10 @@
./usr/lib/i386/libc.so comp-sys-shlib compat,pic
./usr/lib/i386/libc_p.a comp-c-proflib compat,profile
./usr/lib/i386/libc_pic.a comp-c-piclib compat,pic
+./usr/lib/i386/libc++.a comp-c-lib compat,libcxx
+./usr/lib/i386/libc++.so comp-sys-shlib compat,pic,libcxx
+./usr/lib/i386/libc++_p.a comp-c-proflib compat,profile,libcxx
+./usr/lib/i386/libc++_pic.a comp-c-piclib compat,pic,libcxx
./usr/lib/i386/libcom_err.a comp-c-lib compat,kerberos
./usr/lib/i386/libcom_err.so comp-sys-shlib compat,pic,kerberos
./usr/lib/i386/libcom_err_p.a comp-c-proflib compat,profile,kerberos
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.167 src/distrib/sets/lists/comp/md.sparc64:1.168
--- src/distrib/sets/lists/comp/md.sparc64:1.167 Thu Apr 11 17:43:17 2013
+++ src/distrib/sets/lists/comp/md.sparc64 Sat Apr 27 23:02:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.167 2013/04/11 17:43:17 christos Exp $
+# $NetBSD: md.sparc64,v 1.168 2013/04/27 23:02:19 joerg Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -278,6 +278,10 @@
./usr/lib/sparc/libc.so base-sys-shlib compat,pic
./usr/lib/sparc/libc_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libc_pic.a comp-c-piclib compat,pic
+./usr/lib/soarc/libc++.a comp-c-lib compat,libcxx
+./usr/lib/sparc/libc++.so comp-sys-shlib compat,pic,libcxx
+./usr/lib/sparc/libc++_p.a comp-c-proflib compat,profile,libcxx
+./usr/lib/sparc/libc++_pic.a comp-c-piclib compat,pic,libcxx
./usr/lib/sparc/libcom_err.a comp-c-lib compat,kerberos
./usr/lib/sparc/libcom_err.so base-sys-shlib compat,pic,kerberos
./usr/lib/sparc/libcom_err_p.a comp-c-proflib compat,profile,kerberos
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1817 src/distrib/sets/lists/comp/mi:1.1818
--- src/distrib/sets/lists/comp/mi:1.1817 Fri Apr 26 18:32:41 2013
+++ src/distrib/sets/lists/comp/mi Sat Apr 27 23:02:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1817 2013/04/26 18:32:41 christos Exp $
+# $NetBSD: mi,v 1.1818 2013/04/27 23:02:19 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -204,6 +204,104 @@
./usr/include/bluetooth.h comp-c-include
./usr/include/bm.h comp-c-include
./usr/include/bzlib.h comp-c-include
+./usr/include/c++/__bit_reference comp-cxx-include libcxx
+./usr/include/c++/__config comp-cxx-include libcxx
+./usr/include/c++/__debug comp-cxx-include libcxx
+./usr/include/c++/__functional_03 comp-cxx-include libcxx
+./usr/include/c++/__functional_base comp-cxx-include libcxx
+./usr/include/c++/__functional_base_03 comp-cxx-include libcxx
+./usr/include/c++/__hash_table comp-cxx-include libcxx
+./usr/include/c++/__locale comp-cxx-include libcxx
+./usr/include/c++/__mutex_base comp-cxx-include libcxx
+./usr/include/c++/__split_buffer comp-cxx-include libcxx
+./usr/include/c++/__sso_allocator comp-cxx-include libcxx
+./usr/include/c++/__std_stream comp-cxx-include libcxx
+./usr/include/c++/__tree comp-cxx-include libcxx
+./usr/include/c++/__tuple comp-cxx-include libcxx
+./usr/include/c++/__tuple_03 comp-cxx-include libcxx
+./usr/include/c++/__undef_min_max comp-cxx-include libcxx
+./usr/include/c++/algorithm comp-cxx-include libcxx
+./usr/include/c++/array comp-cxx-include libcxx
+./usr/include/c++/atomic comp-cxx-include libcxx
+./usr/include/c++/bitset comp-cxx-include libcxx
+./usr/include/c++/cassert comp-cxx-include libcxx
+./usr/include/c++/ccomplex comp-cxx-include libcxx
+./usr/include/c++/cctype comp-cxx-include libcxx
+./usr/include/c++/cerrno comp-cxx-include libcxx
+./usr/include/c++/cfenv comp-cxx-include libcxx
+./usr/include/c++/cfloat comp-cxx-include libcxx
+./usr/include/c++/chrono comp-cxx-include libcxx
+./usr/include/c++/cinttypes comp-cxx-include libcxx
+./usr/include/c++/ciso646 comp-cxx-include libcxx
+./usr/include/c++/climits comp-cxx-include libcxx
+./usr/include/c++/clocale comp-cxx-include libcxx
+./usr/include/c++/cmath comp-cxx-include libcxx
+./usr/include/c++/codecvt comp-cxx-include libcxx
+./usr/include/c++/complex comp-cxx-include libcxx
+./usr/include/c++/complex.h comp-cxx-include libcxx
+./usr/include/c++/condition_variable comp-cxx-include libcxx
+./usr/include/c++/csetjmp comp-cxx-include libcxx
+./usr/include/c++/csignal comp-cxx-include libcxx
+./usr/include/c++/cstdarg comp-cxx-include libcxx
+./usr/include/c++/cstdbool comp-cxx-include libcxx
+./usr/include/c++/cstddef comp-cxx-include libcxx
+./usr/include/c++/cstdint comp-cxx-include libcxx
+./usr/include/c++/cstdio comp-cxx-include libcxx
+./usr/include/c++/cstdlib comp-cxx-include libcxx
+./usr/include/c++/cstring comp-cxx-include libcxx
+./usr/include/c++/ctgmath comp-cxx-include libcxx
+./usr/include/c++/ctime comp-cxx-include libcxx
+./usr/include/c++/cwchar comp-cxx-include libcxx
+./usr/include/c++/cwctype comp-cxx-include libcxx
+./usr/include/c++/deque comp-cxx-include libcxx
+./usr/include/c++/exception comp-cxx-include libcxx
+./usr/include/c++/ext/__hash comp-cxx-include libcxx
+./usr/include/c++/ext/hash_map comp-cxx-include libcxx
+./usr/include/c++/ext/hash_set comp-cxx-include libcxx
+./usr/include/c++/forward_list comp-cxx-include libcxx
+./usr/include/c++/fstream comp-cxx-include libcxx
+./usr/include/c++/functional comp-cxx-include libcxx
+./usr/include/c++/future comp-cxx-include libcxx
+./usr/include/c++/initializer_list comp-cxx-include libcxx
+./usr/include/c++/iomanip comp-cxx-include libcxx
+./usr/include/c++/ios comp-cxx-include libcxx
+./usr/include/c++/iosfwd comp-cxx-include libcxx
+./usr/include/c++/iostream comp-cxx-include libcxx
+./usr/include/c++/istream comp-cxx-include libcxx
+./usr/include/c++/iterator comp-cxx-include libcxx
+./usr/include/c++/limits comp-cxx-include libcxx
+./usr/include/c++/list comp-cxx-include libcxx
+./usr/include/c++/locale comp-cxx-include libcxx
+./usr/include/c++/map comp-cxx-include libcxx
+./usr/include/c++/memory comp-cxx-include libcxx
+./usr/include/c++/mutex comp-cxx-include libcxx
+./usr/include/c++/new comp-cxx-include libcxx
+./usr/include/c++/numeric comp-cxx-include libcxx
+./usr/include/c++/ostream comp-cxx-include libcxx
+./usr/include/c++/queue comp-cxx-include libcxx
+./usr/include/c++/random comp-cxx-include libcxx
+./usr/include/c++/ratio comp-cxx-include libcxx
+./usr/include/c++/regex comp-cxx-include libcxx
+./usr/include/c++/scoped_allocator comp-cxx-include libcxx
+./usr/include/c++/set comp-cxx-include libcxx
+./usr/include/c++/sstream comp-cxx-include libcxx
+./usr/include/c++/stack comp-cxx-include libcxx
+./usr/include/c++/stdexcept comp-cxx-include libcxx
+./usr/include/c++/streambuf comp-cxx-include libcxx
+./usr/include/c++/string comp-cxx-include libcxx
+./usr/include/c++/strstream comp-cxx-include libcxx
+./usr/include/c++/system_error comp-cxx-include libcxx
+./usr/include/c++/tgmath.h comp-cxx-include libcxx
+./usr/include/c++/thread comp-cxx-include libcxx
+./usr/include/c++/tuple comp-cxx-include libcxx
+./usr/include/c++/type_traits comp-cxx-include libcxx
+./usr/include/c++/typeindex comp-cxx-include libcxx
+./usr/include/c++/typeinfo comp-cxx-include libcxx
+./usr/include/c++/unordered_map comp-cxx-include libcxx
+./usr/include/c++/unordered_set comp-cxx-include libcxx
+./usr/include/c++/utility comp-cxx-include libcxx
+./usr/include/c++/valarray comp-cxx-include libcxx
+./usr/include/c++/vector comp-cxx-include libcxx
./usr/include/cdbr.h comp-c-include
./usr/include/cdbw.h comp-c-include
./usr/include/cdk/alphalist.h comp-obsolete obsolete
@@ -2787,6 +2885,8 @@
./usr/lib/libbz2_p.a comp-c-proflib profile
./usr/lib/libc.a comp-c-lib
./usr/lib/libc_p.a comp-c-proflib profile
+./usr/lib/libc++.a comp-c-lib libcxx
+./usr/lib/libc++_p.a comp-c-proflib libcxx,profile
./usr/lib/libcdk.a comp-obsolete obsolete
./usr/lib/libcdk_p.a comp-obsolete obsolete
./usr/lib/libcom_err.a comp-krb5-lib kerberos
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.247 src/distrib/sets/lists/comp/shl.mi:1.248
--- src/distrib/sets/lists/comp/shl.mi:1.247 Thu Apr 11 17:43:19 2013
+++ src/distrib/sets/lists/comp/shl.mi Sat Apr 27 23:02:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.247 2013/04/11 17:43:19 christos Exp $
+# $NetBSD: shl.mi,v 1.248 2013/04/27 23:02:21 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -17,6 +17,7 @@
./usr/lib/libbsdmalloc_pic.a comp-c-piclib
./usr/lib/libbz2_pic.a comp-c-piclib
./usr/lib/libc_pic.a comp-c-piclib
+./usr/lib/libc++_pic.a comp-c-piclib libcxx
./usr/lib/libcdk_pic.a comp-obsolete obsolete
./usr/lib/libcom_err_pic.a comp-c-piclib kerberos
./usr/lib/libcompat_pic.a comp-c-piclib
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.118 src/etc/mtree/NetBSD.dist.base:1.119
--- src/etc/mtree/NetBSD.dist.base:1.118 Thu Apr 11 17:51:04 2013
+++ src/etc/mtree/NetBSD.dist.base Sat Apr 27 23:02:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.118 2013/04/11 17:51:04 christos Exp $
+# $NetBSD: NetBSD.dist.base,v 1.119 2013/04/27 23:02:21 joerg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -97,6 +97,8 @@
./usr/include/arpa
./usr/include/atf-c
./usr/include/atf-c++
+./usr/include/c++
+./usr/include/c++/ext
./usr/include/clang-3.3
./usr/include/crypto
./usr/include/dev
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.201 src/lib/Makefile:1.202
--- src/lib/Makefile:1.201 Sat Apr 27 08:43:19 2013
+++ src/lib/Makefile Sat Apr 27 23:02:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2013/04/27 08:43:19 matt Exp $
+# $NetBSD: Makefile,v 1.202 2013/04/27 23:02:22 joerg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -139,6 +139,10 @@ SUBDIR+= ../external/gpl2/lvm2/lib # dep
SUBDIR+= ../external/gpl3/binutils/lib # libbfd depends on libz
.endif
+.if (${MKLIBCXX} != "no")
+SUBDIR+= ../external/bsd/libc++
+.endif
+
.if (${MKGCC} != "no" && ${MKCXX} != "no")
. if ${HAVE_GCC} == 4
SUBDIR+= ../gnu/lib/libstdc++-v3_4 # depends on libm
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.726 src/share/mk/bsd.own.mk:1.727
--- src/share/mk/bsd.own.mk:1.726 Sat Apr 27 08:42:44 2013
+++ src/share/mk/bsd.own.mk Sat Apr 27 23:02:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.726 2013/04/27 08:42:44 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.727 2013/04/27 23:02:22 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -894,7 +894,7 @@ _MKVARS.no= \
MKDEBUGLIB MKDTRACE MKEXTSRC \
MKKYUA \
MKMANZ MKMCLINKER MKOBJDIRS \
- MKLLVM MKPCC \
+ MKLIBCXX MKLLVM MKPCC \
MKPIGZGZIP \
MKREPRO \
MKSOFTFLOAT MKSTRIPIDENT MKTPM \
Added files:
Index: src/external/bsd/libc++/Makefile
diff -u /dev/null src/external/bsd/libc++/Makefile:1.1
--- /dev/null Sat Apr 27 23:02:22 2013
+++ src/external/bsd/libc++/Makefile Sat Apr 27 23:02:21 2013
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2013/04/27 23:02:21 joerg Exp $
+
+SUBDIR= include lib
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/libc++/Makefile.inc
diff -u /dev/null src/external/bsd/libc++/Makefile.inc:1.1
--- /dev/null Sat Apr 27 23:02:22 2013
+++ src/external/bsd/libc++/Makefile.inc Sat Apr 27 23:02:21 2013
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/04/27 23:02:21 joerg Exp $
+
+.include <bsd.own.mk>
+
+LIBCXXRT_SRCDIR:= ${.PARSEDIR}/dist/libcxxrt
+LIBCXX_SRCDIR:= ${.PARSEDIR}/dist/libcxx
Index: src/external/bsd/libc++/include/Makefile
diff -u /dev/null src/external/bsd/libc++/include/Makefile:1.1
--- /dev/null Sat Apr 27 23:02:22 2013
+++ src/external/bsd/libc++/include/Makefile Sat Apr 27 23:02:21 2013
@@ -0,0 +1,113 @@
+# $NetBSD: Makefile,v 1.1 2013/04/27 23:02:21 joerg Exp $
+
+.include <bsd.init.mk>
+
+.PATH: ${LIBCXX_SRCDIR}/include
+.PATH: ${LIBCXX_SRCDIR}/include/ext
+
+INCS= __bit_reference \
+ __config \
+ __debug \
+ __functional_03 \
+ __functional_base \
+ __functional_base_03 \
+ __hash_table \
+ __locale \
+ __mutex_base \
+ __split_buffer \
+ __sso_allocator \
+ __std_stream \
+ __tree \
+ __tuple \
+ __tuple_03 \
+ __undef_min_max \
+ algorithm \
+ array \
+ atomic \
+ bitset \
+ cassert \
+ ccomplex \
+ cctype \
+ cerrno \
+ cfenv \
+ cfloat \
+ chrono \
+ cinttypes \
+ ciso646 \
+ climits \
+ clocale \
+ cmath \
+ codecvt \
+ complex \
+ complex.h \
+ condition_variable \
+ csetjmp \
+ csignal \
+ cstdarg \
+ cstdbool \
+ cstddef \
+ cstdint \
+ cstdio \
+ cstdlib \
+ cstring \
+ ctgmath \
+ ctime \
+ cwchar \
+ cwctype \
+ deque \
+ exception \
+ forward_list \
+ fstream \
+ functional \
+ future \
+ initializer_list \
+ iomanip \
+ ios \
+ iosfwd \
+ iostream \
+ istream \
+ iterator \
+ limits \
+ list \
+ locale \
+ map \
+ memory \
+ mutex \
+ new \
+ numeric \
+ ostream \
+ queue \
+ random \
+ ratio \
+ regex \
+ scoped_allocator \
+ set \
+ sstream \
+ stack \
+ stdexcept \
+ streambuf \
+ string \
+ strstream \
+ system_error \
+ tgmath.h \
+ thread \
+ tuple \
+ typeindex \
+ typeinfo \
+ type_traits \
+ unordered_map \
+ unordered_set \
+ utility \
+ valarray \
+ vector \
+ __hash \
+ hash_map \
+ hash_set
+
+INCSDIR= /usr/include/c++
+.for f in __hash hash_map hash_set
+INCSDIR_${f}= /usr/include/c++/ext
+.endfor
+
+.include <bsd.inc.mk>
+.include <bsd.obj.mk>
Index: src/external/bsd/libc++/lib/Makefile
diff -u /dev/null src/external/bsd/libc++/lib/Makefile:1.1
--- /dev/null Sat Apr 27 23:02:23 2013
+++ src/external/bsd/libc++/lib/Makefile Sat Apr 27 23:02:21 2013
@@ -0,0 +1,45 @@
+# $NetBSD: Makefile,v 1.1 2013/04/27 23:02:21 joerg Exp $
+
+LIB= c++
+WARNS= 4
+NOLINT= # defined
+
+.include <bsd.init.mk>
+
+.PATH: ${LIBCXX_SRCDIR}/src
+
+SRCS= algorithm.cpp bind.cpp chrono.cpp condition_variable.cpp debug.cpp \
+ exception.cpp future.cpp hash.cpp ios.cpp iostream.cpp locale.cpp \
+ memory.cpp mutex.cpp new.cpp random.cpp regex.cpp stdexcept.cpp \
+ string.cpp strstream.cpp system_error.cpp thread.cpp typeinfo.cpp \
+ utility.cpp valarray.cpp
+
+LIBCXXRT_SRCS+= \
+ auxhelper.cc dynamic_cast.cc exception.cc guard.cc memory.cc \
+ stdexcept.cc terminate.cc typeinfo.cc cxa_atexit.c libelftc_dem_gnu3.c
+
+.for src in ${LIBCXXRT_SRCS}
+rt_${src}: ${LIBCXXRT_SRCDIR}/src/${src}
+ cp ${LIBCXXRT_SRCDIR}/src/${src} rt_${src}
+
+SRCS+= rt_${src}
+DPSRCS+= rt_${src}
+CLEANFILES+= rt_${src}
+.endfor
+
+.include <bsd.own.mk>
+
+CPPFLAGS+= -cxx-isystem ${LIBCXX_SRCDIR}/include -I${LIBCXXRT_SRCDIR}/src
+CPPFLAGS+= -DLIBCXXRT
+CXXFLAGS+= ${${ACTIVE_CC} == "clang":? -std=c++11 : -std=c++0x}
+
+CWARNFLAGS.gcc+= -Wno-error
+
+CWARNFLAGS.clang+= -Wno-error=unused-variable -Wno-error=missing-noreturn
+CWARNFLAGS.clang+= -Wno-error=missing-prototypes -Wno-error=sometimes-uninitialized
+CWARNFLAGS.clang+= -Wno-error=missing-field-initializers -Wno-error=switch
+CWARNFLAGS.clang+= -Wno-error=implicit-exception-spec-mismatch
+
+LDADD+= -Wl,-z,defs
+
+.include <bsd.lib.mk>
Index: src/external/bsd/libc++/lib/shlib_version
diff -u /dev/null src/external/bsd/libc++/lib/shlib_version:1.1
--- /dev/null Sat Apr 27 23:02:23 2013
+++ src/external/bsd/libc++/lib/shlib_version Sat Apr 27 23:02:21 2013
@@ -0,0 +1,5 @@
+# $NetBSD: shlib_version,v 1.1 2013/04/27 23:02:21 joerg Exp $
+# Remember to update distrib/sets/lists/base/shl.* when changing
+#
+major=1
+minor=0
