| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile.common,v 1.77 2018/09/02 12:53:36 leot Exp $ | | 1 | # $NetBSD: Makefile.common,v 1.78 2018/09/07 10:03:45 jperkin 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 | |
11 | BOOST_PACKAGE?= undefined | | 11 | BOOST_PACKAGE?= undefined |
12 | BOOST_COMMENT?= undefined | | 12 | BOOST_COMMENT?= undefined |
13 | BOOST_VERSION= 1.68.0 | | 13 | BOOST_VERSION= 1.68.0 |
14 | BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} | | 14 | BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} |
| @@ -79,27 +79,27 @@ BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURC | | | @@ -79,27 +79,27 @@ BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURC |
79 | # the native libtool from /Developer/usr/bin or /usr/bin. | | 79 | # the native libtool from /Developer/usr/bin or /usr/bin. |
80 | post-wrapper: | | 80 | 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. |
91 | pre-configure: | | 91 | pre-configure: |
92 | ${FIND} ${WRKSRC} -type f | ${XARGS} ${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 | # Generate a new user.hpp or use the installed one, depending on the package |
95 | # we are building. | | 95 | # we are building. |
96 | . if ${BOOST_CONFIG} == "installed" | | 96 | . if ${BOOST_CONFIG} == "installed" |
97 | . include "../../devel/boost-headers/buildlink3.mk" | | 97 | . include "../../devel/boost-headers/buildlink3.mk" |
98 | do-configure: | | 98 | do-configure: |
99 | ${CP} -f \ | | 99 | ${CP} -f \ |
100 | ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ | | 100 | ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ |
101 | ${WRKSRC}/boost/config/user.hpp | | 101 | ${WRKSRC}/boost/config/user.hpp |
102 | . elif ${BOOST_CONFIG} == "generate" | | 102 | . elif ${BOOST_CONFIG} == "generate" |
103 | do-configure: | | 103 | do-configure: |
104 | cd ${WRKSRC}/libs/config && \ | | 104 | cd ${WRKSRC}/libs/config && \ |
105 | ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure | | 105 | ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure |