Thu Jan 4 10:25:35 2018 UTC ()
boost: use c++17 as a test for having string view, not NetBSD macro.

This changes the package for anyone that used it with C++17 experimental
support and now won't get it (we're cutting off at 'actual C++17').

Bump headers PKGREVISION, suggested by joerg.


(maya)
diff -r1.44 -r1.45 pkgsrc/devel/boost-headers/Makefile
diff -r1.110 -r1.111 pkgsrc/meta-pkgs/boost/distinfo
diff -r1.3 -r1.4 pkgsrc/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp

cvs diff -r1.44 -r1.45 pkgsrc/devel/boost-headers/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/boost-headers/Makefile 2017/08/24 19:31:31 1.44
+++ pkgsrc/devel/boost-headers/Makefile 2018/01/04 10:25:35 1.45
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: Makefile,v 1.44 2017/08/24 19:31:31 adam Exp $ 1# $NetBSD: Makefile,v 1.45 2018/01/04 10:25:35 maya Exp $
2 2
3BOOST_PACKAGE= headers 3BOOST_PACKAGE= headers
4BOOST_COMMENT= (build-time headers) 4BOOST_COMMENT= (build-time headers)
5BOOST_CONFIG= generate 5BOOST_CONFIG= generate
6 6
7.include "../../meta-pkgs/boost/Makefile.common" 7.include "../../meta-pkgs/boost/Makefile.common"
8 8
 9PKGREVISION= 1
 10
9BJAM_ARGS+= --without-* # disable all libraries 11BJAM_ARGS+= --without-* # disable all libraries
10 12
11NO_BUILD= yes 13NO_BUILD= yes
12 14
13.include "../../devel/boost-jam/bjam.mk" 15.include "../../devel/boost-jam/bjam.mk"
14 16
15do-install: bjam-install 17do-install: bjam-install
16 ${FIND} ${DESTDIR}${PREFIX}/include/boost \ 18 ${FIND} ${DESTDIR}${PREFIX}/include/boost \
17 -type f -print | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP} 19 -type f -print | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
18 ${FIND} ${DESTDIR}${PREFIX}/include/boost \ 20 ${FIND} ${DESTDIR}${PREFIX}/include/boost \
19 -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} 21 -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
20 22
21PTHREAD_OPTS+= require 23PTHREAD_OPTS+= require

cvs diff -r1.110 -r1.111 pkgsrc/meta-pkgs/boost/distinfo (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/distinfo 2018/01/02 06:39:49 1.110
+++ pkgsrc/meta-pkgs/boost/distinfo 2018/01/04 10:25:35 1.111
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.110 2018/01/02 06:39:49 ryoon Exp $ 1$NetBSD: distinfo,v 1.111 2018/01/04 10:25:35 maya Exp $
2 2
3SHA1 (boost_1_66_0.tar.bz2) = b6b284acde2ad7ed49b44e856955d7b1ea4e9459 3SHA1 (boost_1_66_0.tar.bz2) = b6b284acde2ad7ed49b44e856955d7b1ea4e9459
4RMD160 (boost_1_66_0.tar.bz2) = ee5dafdfa49adf50a5333cef1f55dac4f70b4c14 4RMD160 (boost_1_66_0.tar.bz2) = ee5dafdfa49adf50a5333cef1f55dac4f70b4c14
5SHA512 (boost_1_66_0.tar.bz2) = 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b 5SHA512 (boost_1_66_0.tar.bz2) = 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
6Size (boost_1_66_0.tar.bz2) = 85995778 bytes 6Size (boost_1_66_0.tar.bz2) = 85995778 bytes
7SHA1 (patch-boost_archive_basic__archive.hpp) = 7e7c88cfc00fbf524c70dedd8b9c3c889f8b684f 7SHA1 (patch-boost_archive_basic__archive.hpp) = 7e7c88cfc00fbf524c70dedd8b9c3c889f8b684f
8SHA1 (patch-boost_asio_detail_config.hpp) = 2495833a0621a90c2c8cb0e5325b50a812f631c4 8SHA1 (patch-boost_asio_detail_config.hpp) = 53a34546638e1264b4d098dfe189abd3b0901027
9SHA1 (patch-boost_atomic_detail_ops_gcc_sparc.hpp) = 6cd1b6fbb8659d7af8ecff63d4558f365f28c12b 9SHA1 (patch-boost_atomic_detail_ops_gcc_sparc.hpp) = 6cd1b6fbb8659d7af8ecff63d4558f365f28c12b
10SHA1 (patch-boost_config_detail_posix__features.hpp) = 7d310574e7020c79c8bfa87cff4db0a2edc5b0bc 10SHA1 (patch-boost_config_detail_posix__features.hpp) = 7d310574e7020c79c8bfa87cff4db0a2edc5b0bc
11SHA1 (patch-boost_config_detail_suffix.hpp) = 12e22085e7c292b2451ea8bc581beaddcb936252 11SHA1 (patch-boost_config_detail_suffix.hpp) = 12e22085e7c292b2451ea8bc581beaddcb936252
12SHA1 (patch-boost_config_platform_bsd.hpp) = 234dfd1582dd62f0b149ee12aabcc1f1f602af97 12SHA1 (patch-boost_config_platform_bsd.hpp) = 234dfd1582dd62f0b149ee12aabcc1f1f602af97
13SHA1 (patch-boost_config_stdlib_libcpp.hpp) = d57ee228c9dfa43665d261e7423fd10122dfd1a7 13SHA1 (patch-boost_config_stdlib_libcpp.hpp) = d57ee228c9dfa43665d261e7423fd10122dfd1a7
14SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 52ebedd5e80b3a8c257eccb28cd2db76cb1ca01e 14SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 52ebedd5e80b3a8c257eccb28cd2db76cb1ca01e
15SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6fe 15SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6fe
16SHA1 (patch-boost_math_special__functions_expm1.hpp) = 724fbd40b3780da8af6ce10bbf50a354eb19031a 16SHA1 (patch-boost_math_special__functions_expm1.hpp) = 724fbd40b3780da8af6ce10bbf50a354eb19031a
17SHA1 (patch-boost_math_special__functions_log1p.hpp) = df6fd088da736a4640663b64841383432f1a1201 17SHA1 (patch-boost_math_special__functions_log1p.hpp) = df6fd088da736a4640663b64841383432f1a1201
18SHA1 (patch-boost_math_tools_config.hpp) = daf8cf1fdac8169825c06804ca6d667792be0e9a 18SHA1 (patch-boost_math_tools_config.hpp) = daf8cf1fdac8169825c06804ca6d667792be0e9a
19SHA1 (patch-boost_numeric_ublas_storage.hpp) = 282b5a3b5d09216ded14fae166169d64db72590e 19SHA1 (patch-boost_numeric_ublas_storage.hpp) = 282b5a3b5d09216ded14fae166169d64db72590e
20SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f 20SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f
21SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 21SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12

cvs diff -r1.3 -r1.4 pkgsrc/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp 2018/01/02 06:39:49 1.3
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp 2018/01/04 10:25:35 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-boost_asio_detail_config.hpp,v 1.3 2018/01/02 06:39:49 ryoon Exp $ 1$NetBSD: patch-boost_asio_detail_config.hpp,v 1.4 2018/01/04 10:25:35 maya Exp $
2 2
3* NetBSD has no string_view header files 3Need C++17 for string view.
4 4
5--- boost/asio/detail/config.hpp.orig 2017-12-13 23:56:41.000000000 +0000 5--- boost/asio/detail/config.hpp.orig 2017-12-13 23:56:41.000000000 +0000
6+++ boost/asio/detail/config.hpp 6+++ boost/asio/detail/config.hpp
7@@ -782,8 +782,10 @@ 7@@ -782,8 +782,10 @@
8 # if defined(__GNUC__) 8 # if defined(__GNUC__)
9 # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) 9 # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
10 # if (__cplusplus >= 201402) 10 # if (__cplusplus >= 201402)
11+#if !defined(__NetBSD__) 11+#if __cplusplus >= 201703L
12 # define BOOST_ASIO_HAS_STD_STRING_VIEW 1 12 # define BOOST_ASIO_HAS_STD_STRING_VIEW 1
13 # define BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 13 # define BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
14+#endif 14+#endif
15 # endif // (__cplusplus >= 201402) 15 # endif // (__cplusplus >= 201402)
16 # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) 16 # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
17 # endif // defined(__GNUC__) 17 # endif // defined(__GNUC__)