Fri Sep 7 10:03:45 2018 UTC ()
boost: The tarball contains files with spaces, use -print0.


(jperkin)
diff -r1.77 -r1.78 pkgsrc/meta-pkgs/boost/Makefile.common
cvs diff -r1.77 -r1.78 pkgsrc/meta-pkgs/boost/Makefile.common (switch to unified diff)

--- pkgsrc/meta-pkgs/boost/Makefile.common 2018/09/02 12:53:36 1.77
+++ pkgsrc/meta-pkgs/boost/Makefile.common 2018/09/07 10:03:45 1.78
@@ -1,113 +1,113 @@ @@ -1,113 +1,113 @@
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
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/\..*$//}
15 15
16# Update mysql57-client/patches/patch-cmake_boost.cmake when updating version 16# Update mysql57-client/patches/patch-cmake_boost.cmake when updating version
17 17
18DISTNAME= boost_${BOOST_VERSION:S/./_/g} 18DISTNAME= boost_${BOOST_VERSION:S/./_/g}
19CATEGORIES= devel 19CATEGORIES= devel
20 20
21.if ${BOOST_PACKAGE} == "meta-pkg" 21.if ${BOOST_PACKAGE} == "meta-pkg"
22PKGNAME= boost-${BOOST_VERSION} 22PKGNAME= boost-${BOOST_VERSION}
23.else # ${BOOST_PACKAGE} != "meta-pkg" 23.else # ${BOOST_PACKAGE} != "meta-pkg"
24PKGNAME= boost-${BOOST_PACKAGE}-${BOOST_VERSION} 24PKGNAME= boost-${BOOST_PACKAGE}-${BOOST_VERSION}
25 25
26MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/} 26MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
27EXTRACT_SUFX= .tar.bz2 27EXTRACT_SUFX= .tar.bz2
28 28
29MAINTAINER= pkgsrc-users@NetBSD.org 29MAINTAINER= pkgsrc-users@NetBSD.org
30HOMEPAGE= http://www.boost.org/ 30HOMEPAGE= http://www.boost.org/
31COMMENT= Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT} 31COMMENT= Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT}
32LICENSE= boost-license 32LICENSE= boost-license
33 33
34CONFLICTS+= boost<1.36.0 34CONFLICTS+= boost<1.36.0
35 35
36DISTINFO_FILE= ${.CURDIR}/../../meta-pkgs/boost/distinfo 36DISTINFO_FILE= ${.CURDIR}/../../meta-pkgs/boost/distinfo
37PATCHDIR= ${.CURDIR}/../../meta-pkgs/boost/patches 37PATCHDIR= ${.CURDIR}/../../meta-pkgs/boost/patches
38 38
39.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
40 40
41USE_TOOLS+= pax 41USE_TOOLS+= pax
42USE_LANGUAGES= c c++ 42USE_LANGUAGES= c c++
43 43
44# IMPORTANT: sync this with devel/boost-libs/buildlink3.mk 44# IMPORTANT: sync this with devel/boost-libs/buildlink3.mk
45# GCC 4.5 or later is required to build, and GCC 4.5 is not provided for OpenBSD 45# GCC 4.5 or later is required to build, and GCC 4.5 is not provided for OpenBSD
46. if ${OPSYS} == "OpenBSD" 46. if ${OPSYS} == "OpenBSD"
47. if ${MACHINE_ARCH} != "sparc64" 47. if ${MACHINE_ARCH} != "sparc64"
48GCC_REQD+= 4.6 48GCC_REQD+= 4.6
49. endif 49. endif
50. elif ${LOWER_VENDOR} == "redhat" 50. elif ${LOWER_VENDOR} == "redhat"
51GCC_REQD+= 4.4 51GCC_REQD+= 4.4
52. else 52. else
53GCC_REQD+= 4.5 53GCC_REQD+= 4.5
54. endif 54. endif
55 55
56PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}" 56PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}"
57 57
58SUBST_CLASSES+= prefix 58SUBST_CLASSES+= prefix
59SUBST_STAGE.prefix= pre-configure 59SUBST_STAGE.prefix= pre-configure
60SUBST_MESSAGE.prefix= Fixing prefix. 60SUBST_MESSAGE.prefix= Fixing prefix.
61SUBST_FILES.prefix= boostcpp.jam 61SUBST_FILES.prefix= boostcpp.jam
62SUBST_VARS.prefix= PREFIX 62SUBST_VARS.prefix= PREFIX
63 63
64SUBST_CLASSES+= darwin 64SUBST_CLASSES+= darwin
65SUBST_STAGE.darwin= pre-configure 65SUBST_STAGE.darwin= pre-configure
66SUBST_MESSAGE.darwin= Fixing install_name for Darwin. 66SUBST_MESSAGE.darwin= Fixing install_name for Darwin.
67SUBST_FILES.darwin= tools/build/src/tools/*darwin.jam 67SUBST_FILES.darwin= tools/build/src/tools/*darwin.jam
68SUBST_SED.darwin= -e 's,-install_name "@rpath,-install_name "${PREFIX}/lib,g' 68SUBST_SED.darwin= -e 's,-install_name "@rpath,-install_name "${PREFIX}/lib,g'
69SUBST_SED.darwin+= -e 's,-install_name "\$$,-install_name "${PREFIX}/lib/\$$,g' 69SUBST_SED.darwin+= -e 's,-install_name "\$$,-install_name "${PREFIX}/lib/\$$,g'
70 70
71# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar. 71# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar.
72. if ${OPSYS} == "SunOS" 72. if ${OPSYS} == "SunOS"
73TOOLS_PLATFORM.tar= #empty 73TOOLS_PLATFORM.tar= #empty
74BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600 74BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600
75. endif 75. endif
76 76
77. if ${OPSYS} == "Darwin" 77. if ${OPSYS} == "Darwin"
78# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs 78# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs
79# the native libtool from /Developer/usr/bin or /usr/bin. 79# the native libtool from /Developer/usr/bin or /usr/bin.
80post-wrapper: 80post-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 | ${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"
98do-configure: 98do-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"
103do-configure: 103do-configure:
104 cd ${WRKSRC}/libs/config && \ 104 cd ${WRKSRC}/libs/config && \
105 ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure 105 ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure
106 ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp 106 ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp
107. endif 107. endif
108 108
109boost-install-libs: 109boost-install-libs:
110 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib 110 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
111 cd ${WRKSRC}/stage/lib && pax -rw -p p libboost* ${DESTDIR}${PREFIX}/lib 111 cd ${WRKSRC}/stage/lib && pax -rw -p p libboost* ${DESTDIR}${PREFIX}/lib
112 112
113.endif # ${BOOST_PACKAGE} == "meta-pkg" 113.endif # ${BOOST_PACKAGE} == "meta-pkg"