Sun Dec 2 14:32:17 2018 UTC ()
boost-headers: do not generate user.hpp during configure.

Use the pregenerated file instead.
The configure step is only intended to be used as a base
when porting to new platforms, and as-is it didn't use the
same flags that were used in other places.

See https://github.com/boostorg/config/issues/240 for more details.

Bump PKGREVISION.


(wiz)
diff -r1.51 -r1.52 pkgsrc/devel/boost-headers/Makefile
diff -r1.78 -r1.79 pkgsrc/meta-pkgs/boost/Makefile.common
cvs diff -r1.51 -r1.52 pkgsrc/devel/boost-headers/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/boost-headers/Makefile 2018/08/16 15:58:32 1.51
+++ pkgsrc/devel/boost-headers/Makefile 2018/12/02 14:32:17 1.52
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.51 2018/08/16 15:58:32 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2018/12/02 14:32:17 wiz 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
 6PKGREVISION= 1
6 7
7.include "../../meta-pkgs/boost/Makefile.common" 8.include "../../meta-pkgs/boost/Makefile.common"
8 9
9BJAM_ARGS+= --without-\* 10BJAM_ARGS+= --without-\*
10 11
11NO_BUILD= yes 12NO_BUILD= yes
12 13
13.include "../../devel/boost-jam/bjam.mk" 14.include "../../devel/boost-jam/bjam.mk"
14 15
15do-install: bjam-install 16do-install: bjam-install
16 ${FIND} ${DESTDIR}${PREFIX}/include/boost \ 17 ${FIND} ${DESTDIR}${PREFIX}/include/boost \
17 -type f -exec ${CHOWN} ${SHAREOWN}:${SHAREGRP} {} + 18 -type f -exec ${CHOWN} ${SHAREOWN}:${SHAREGRP} {} +
18 ${FIND} ${DESTDIR}${PREFIX}/include/boost \ 19 ${FIND} ${DESTDIR}${PREFIX}/include/boost \
cvs diff -r1.78 -r1.79 pkgsrc/meta-pkgs/boost/Makefile.common (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/Makefile.common 2018/09/07 10:03:45 1.78
+++ pkgsrc/meta-pkgs/boost/Makefile.common 2018/12/02 14:32:17 1.79
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.78 2018/09/07 10:03:45 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.79 2018/12/02 14:32:17 wiz Exp $
2# 2#
3# used by devel/boost-build/Makefile 3# used by devel/boost-build/Makefile
4# used by devel/boost-docs/Makefile 4# used by devel/boost-docs/Makefile
5# used by devel/boost-jam/Makefile 5# used by devel/boost-jam/Makefile
6# used by devel/boost-headers/Makefile 6# used by devel/boost-headers/Makefile
7# used by devel/boost-libs/Makefile 7# used by devel/boost-libs/Makefile
8# used by devel/boost-mpi/Makefile 8# used by devel/boost-mpi/Makefile
9# used by devel/py-boost/Makefile 9# used by devel/py-boost/Makefile
10 10
11BOOST_PACKAGE?= undefined 11BOOST_PACKAGE?= undefined
12BOOST_COMMENT?= undefined 12BOOST_COMMENT?= undefined
13BOOST_VERSION= 1.68.0 13BOOST_VERSION= 1.68.0
14BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} 14BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//}
@@ -81,33 +81,36 @@ post-wrapper: @@ -81,33 +81,36 @@ post-wrapper:
81 ${RM} -f ${WRAPPER_BINDIR}/libtool 81 ${RM} -f ${WRAPPER_BINDIR}/libtool
82. if exists(/Developer/usr/bin/libtool) 82. if exists(/Developer/usr/bin/libtool)
83 ${LN} -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool 83 ${LN} -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool
84. else 84. else
85 ${LN} -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool 85 ${LN} -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool
86. endif 86. endif
87. endif 87. endif
88 88
89# We can't do this at post-extract because the extract cookie will get a future 89# We can't do this at post-extract because the extract cookie will get a future
90# timestamp than the sources. If this happens, print-PLIST does not work. 90# timestamp than the sources. If this happens, print-PLIST does not work.
91pre-configure: 91pre-configure:
92 ${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${TOUCH} 92 ${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${TOUCH}
93 93
94# Generate a new user.hpp or use the installed one, depending on the package 94# According to https://github.com/boostorg/config/issues/240
95# we are building. 95# the user.hpp generation is intended only for porting to new platforms
96. if ${BOOST_CONFIG} == "installed" 96# and we should use the provided one.
97. include "../../devel/boost-headers/buildlink3.mk" 97## Generate a new user.hpp or use the installed one, depending on the package
98do-configure: 98## we are building.
99 ${CP} -f \ 99#. if ${BOOST_CONFIG} == "installed"
100 ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ 100#. include "../../devel/boost-headers/buildlink3.mk"
101 ${WRKSRC}/boost/config/user.hpp 101#do-configure:
102. elif ${BOOST_CONFIG} == "generate" 102# ${CP} -f \
103do-configure: 103# ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \
104 cd ${WRKSRC}/libs/config && \ 104# ${WRKSRC}/boost/config/user.hpp
105 ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure 105#. elif ${BOOST_CONFIG} == "generate"
106 ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp 106#do-configure:
107. endif 107# cd ${WRKSRC}/libs/config && \
 108# ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure
 109# ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp
 110#. endif
108 111
109boost-install-libs: 112boost-install-libs:
110 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib 113 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
111 cd ${WRKSRC}/stage/lib && pax -rw -p p libboost* ${DESTDIR}${PREFIX}/lib 114 cd ${WRKSRC}/stage/lib && pax -rw -p p libboost* ${DESTDIR}${PREFIX}/lib
112 115
113.endif # ${BOOST_PACKAGE} == "meta-pkg" 116.endif # ${BOOST_PACKAGE} == "meta-pkg"