kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

boost-headers: do not generate user.hpp during configure.

Browse source 
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.
This commit is contained in:
wiz 2018-12-02 14:32:17 +00:00
parent aaf57a895d
commit dde703fad3
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/boost-headers/Makefile
View file

@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.51 2018/08/16 15:58:32 adam Exp $
# $NetBSD: Makefile,v 1.52 2018/12/02 14:32:17 wiz Exp $
BOOST_PACKAGE= headers
BOOST_COMMENT= (build-time headers)
BOOST_CONFIG= generate
PKGREVISION= 1
.include "../../meta-pkgs/boost/Makefile.common"

33
meta-pkgs/boost/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.78 2018/09/07 10:03:45 jperkin Exp $
# $NetBSD: Makefile.common,v 1.79 2018/12/02 14:32:17 wiz Exp $
#
# used by devel/boost-build/Makefile
# used by devel/boost-docs/Makefile
@ -91,20 +91,23 @@ post-wrapper:
pre-configure:
${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${TOUCH}
# Generate a new user.hpp or use the installed one, depending on the package
# we are building.
. if ${BOOST_CONFIG} == "installed"
. include "../../devel/boost-headers/buildlink3.mk"
do-configure:
${CP} -f \
${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \
${WRKSRC}/boost/config/user.hpp
. elif ${BOOST_CONFIG} == "generate"
do-configure:
cd ${WRKSRC}/libs/config && \
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure
${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp
. endif
# According to https://github.com/boostorg/config/issues/240
# the user.hpp generation is intended only for porting to new platforms
# and we should use the provided one.
## Generate a new user.hpp or use the installed one, depending on the package
## we are building.
#. if ${BOOST_CONFIG} == "installed"
#. include "../../devel/boost-headers/buildlink3.mk"
#do-configure:
# ${CP} -f \
# ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \
# ${WRKSRC}/boost/config/user.hpp
#. elif ${BOOST_CONFIG} == "generate"
#do-configure:
# cd ${WRKSRC}/libs/config && \
# ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure
# ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp
#. endif
boost-install-libs:
${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib