Source-Changes-HG archive

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

[src/trunk]: src install new libstdc++ pstl headers. remove some dead makefile



details:   https://anonhg.NetBSD.org/src/rev/1f3f095feb92
branches:  trunk
changeset: 975950:1f3f095feb92
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Sep 09 07:23:45 2020 +0000

description:
install new libstdc++ pstl headers.  remove some dead makefile
code and consolidate some of the header installation.

diffstat:

 distrib/sets/lists/comp/mi                                       |  23 +++++++++-
 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile              |   7 +-
 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc          |   5 +-
 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes     |   6 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile     |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile         |   5 +-
 external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile        |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile      |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile          |   8 +---
 external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile     |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile           |   6 +-
 external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile      |  11 +++-
 external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile |  18 +++++++
 external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile         |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile          |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile     |   7 +--
 external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile          |   7 +--
 17 files changed, 71 insertions(+), 74 deletions(-)

diffs (truncated from 344 to 300 lines):

diff -r 5d61ae5d4be1 -r 1f3f095feb92 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Wed Sep 09 07:12:04 2020 +0000
+++ b/distrib/sets/lists/comp/mi        Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2347 2020/09/06 10:54:26 mrg Exp $
+#      $NetBSD: mi,v 1.2348 2020/09/09 07:23:45 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -1822,6 +1822,27 @@
 ./usr/include/g++/profile/unordered_set                comp-cxx-include        gcc,cxx,libstdcxx
 ./usr/include/g++/profile/vector               comp-cxx-include        gcc,cxx,libstdcxx
 ./usr/include/g++/projectn.h                   comp-obsolete           obsolete
+./usr/include/g++/pstl/algorithm_impl.h                comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/algorithm_fwd.h         comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_algorithm_defs.h   comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/execution_defs.h                comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/execution_impl.h                comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/numeric_impl.h          comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_algorithm_impl.h   comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_memory_defs.h      comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_execution_defs.h   comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_memory_impl.h      comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_numeric_defs.h     comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_numeric_impl.h     comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/memory_impl.h           comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/numeric_fwd.h           comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend_utils.h        comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_impl.h         comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend.h      comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend_tbb.h  comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/unseq_backend_simd.h    comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/utils.h                 comp-cxx-include        gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/pstl_config.h           comp-cxx-include        gcc=9,cxx,libstdcxx
 ./usr/include/g++/pthread_alloc                        comp-obsolete           obsolete
 ./usr/include/g++/pthread_alloc.h              comp-obsolete           obsolete
 ./usr/include/g++/queue                                comp-cxx-include        gcc,cxx,libstdcxx
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2020/09/05 09:50:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2020/09/09 07:23:45 mrg Exp $
 
 SUBDIR=                backward ext bits debug decimal parallel pb profile pstl
 SUBDIR+=       tr1 tr2
@@ -24,10 +24,9 @@
 
 .PATH: ${DIST}/libstdc++-v3
 .PATH: ${DIST}/libstdc++-v3/libsupc++
-#.PATH: ${DIST}/libstdc++-v3/include/c_compatibility
 .PATH: ${DIST}/libstdc++-v3/include/c_global
 .PATH: ${DIST}/libstdc++-v3/include/std
 
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
+.include "Makefile.includes"
+
 .include <bsd.subdir.mk>
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc   Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc   Wed Sep 09 07:23:45 2020 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2020/09/09 07:23:45 mrg Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_INCLUDE_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_INCLUDE_MAKEFILE_INC_=1
 
-.include "../Makefile.inc"
-.include "../../../Makefile.gcc_path"
+.include "${.PARSEDIR}/../Makefile.inc"
 
 DIST=${GCCDIST}
 
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes      Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes      Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.includes,v 1.1 2014/03/01 10:00:47 mrg Exp $
+#      $NetBSD: Makefile.includes,v 1.2 2020/09/09 07:23:45 mrg Exp $
 
 #
 # Always install in INCSDIR regardless of any path in filename
@@ -7,3 +7,7 @@
 INCSDIR_${f:C,/,_,g}=  ${INCSDIR}
 INCSNAME_${f:C,/,_,g}= ${f:T}
 .endfor
+
+.PATH: ${DIST}/libstdc++-v3/include
+
+.include <bsd.prog.mk>
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile      Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile      Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2020/09/09 07:23:45 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -10,8 +10,3 @@
 INCSDIR=       /usr/include/g++/backward
 
 .include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2019/02/09 03:57:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.24 2020/09/09 07:23:45 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -85,9 +85,6 @@
        cp -pf ${.ALLSRC} ${.TARGET}
 .endfor
 
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
 .PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
        ${DIST}/libstdc++-v3/include \
        ${DIST}/libstdc++-v3/config \
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.init.mk>
@@ -11,8 +11,3 @@
 INCSDIR=       /usr/include/g++/debug
 
 .include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile       Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile       Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.init.mk>
@@ -11,8 +11,3 @@
 INCSDIR=       /usr/include/g++/decimal
 
 .include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile   Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile   Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.init.mk>
@@ -13,12 +13,6 @@
 
 .include "${.CURDIR}/../Makefile.includes"
 
-.include <bsd.prog.mk>
-# Get default targets including <bsd.inc.mk>.
-
 .PATH: ${DIST}/libstdc++-v3/include/ext
-.PATH: ${DIST}/libstdc++-v3/include
 .PATH: ${DIST}/libstdc++-v3/config
 .PATH: ${DIST}/libstdc++-v3/libsupc++
-# for ext/hash_set
-#.PATH: ${DIST}/libstdc++-v3/include/backward
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile      Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile      Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.init.mk>
@@ -11,8 +11,3 @@
 INCSDIR=       /usr/include/g++/parallel
 
 .include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile    Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile    Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -13,7 +13,7 @@
 INCS+=         ${G_pb_headers5} ${G_pb_headers6} ${G_pb_headers7}
 INCSDIR=       /usr/include/g++
 
-.PATH: ${DIST}/libstdc++-v3/include
+# XXX: Can't use Makefile.includes
+.PATH: ${DIST}/libstdc++-v3/include
 
-# Get default targets including <bsd.inc.mk>.
 .include <bsd.prog.mk>
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile       Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile       Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -9,10 +9,13 @@
 DIST=          ${GCCDIST}
 GNUHOSTDIST=   ${DIST}
 
-INCS=          ${G_profile_headers} ${G_profile_impl_headers}
+INCS=          ${G_profile_headers}
 INCSDIR=       /usr/include/g++/profile
 
 .PATH: ${DIST}/libstdc++-v3/include/profile
 
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
+.include "${.CURDIR}/../Makefile.includes"
+
+SUBDIR=        impl
+
+.include <bsd.subdir.mk>
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile  Wed Sep 09 07:23:45 2020 +0000
@@ -0,0 +1,18 @@
+#      $NetBSD: Makefile,v 1.1 2020/09/09 07:23:46 mrg Exp $
+
+.include <bsd.init.mk>
+.include "../../Makefile.inc"
+
+.include "${.CURDIR}/../../../arch/${GCC_MACHINE_ARCH}/defs.mk"
+
+.cc: # disable .cc->NULL transform
+
+DIST=          ${GCCDIST}
+GNUHOSTDIST=   ${DIST}
+
+INCS=          ${G_profile_impl_headers}
+INCSDIR=       /usr/include/g++/profile/impl
+
+.PATH: ${DIST}/libstdc++-v3/include/profile/impl
+
+.include "../../Makefile.includes"
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile  Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile  Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/09/05 09:50:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2020/09/09 07:23:46 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -12,7 +12,4 @@
 INCS=          ${G_pstl_headers}
 INCSDIR=       /usr/include/g++/pstl
 
-.PATH: ${DIST}/libstdc++-v3/include/profile
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
+.include "${.CURDIR}/../Makefile.includes"
diff -r 5d61ae5d4be1 -r 1f3f095feb92 external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile   Wed Sep 09 07:12:04 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile   Wed Sep 09 07:23:45 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2020/09/09 07:23:47 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.init.mk>
@@ -11,8 +11,3 @@



Home | Main Index | Thread Index | Old Index