Fri Aug 14 16:17:16 2015 UTC ()
This time, Darwin needs a little more magic


(adam)
diff -r1.54 -r1.55 pkgsrc/meta-pkgs/boost/Makefile.common
cvs diff -r1.54 -r1.55 pkgsrc/meta-pkgs/boost/Makefile.common (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/Makefile.common 2015/08/14 07:54:04 1.54
+++ pkgsrc/meta-pkgs/boost/Makefile.common 2015/08/14 16:17:16 1.55
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.54 2015/08/14 07:54:04 adam Exp $ 1# $NetBSD: Makefile.common,v 1.55 2015/08/14 16:17:16 adam 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/py-boost/Makefile 8# used by devel/py-boost/Makefile
9 9
10BOOST_PACKAGE?= undefined 10BOOST_PACKAGE?= undefined
11BOOST_COMMENT?= undefined 11BOOST_COMMENT?= undefined
12BOOST_VERSION= 1.59.0 12BOOST_VERSION= 1.59.0
13BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} 13BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//}
14 14
@@ -48,27 +48,28 @@ GCC_REQD+= 4.5 @@ -48,27 +48,28 @@ GCC_REQD+= 4.5
48 48
49PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}" 49PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}"
50 50
51SUBST_CLASSES+= prefix 51SUBST_CLASSES+= prefix
52SUBST_STAGE.prefix= pre-configure 52SUBST_STAGE.prefix= pre-configure
53SUBST_MESSAGE.prefix= Fixing prefix. 53SUBST_MESSAGE.prefix= Fixing prefix.
54SUBST_FILES.prefix= boostcpp.jam 54SUBST_FILES.prefix= boostcpp.jam
55SUBST_VARS.prefix= PREFIX 55SUBST_VARS.prefix= PREFIX
56 56
57SUBST_CLASSES+= darwin 57SUBST_CLASSES+= darwin
58SUBST_STAGE.darwin= pre-configure 58SUBST_STAGE.darwin= pre-configure
59SUBST_MESSAGE.darwin= Fixing install_name for Darwin. 59SUBST_MESSAGE.darwin= Fixing install_name for Darwin.
60SUBST_FILES.darwin= tools/build/src/tools/*darwin.jam 60SUBST_FILES.darwin= tools/build/src/tools/*darwin.jam
61SUBST_SED.darwin= -e 's,-install_name ",-install_name "${PREFIX}/lib/,g' 61SUBST_SED.darwin= -e 's,-install_name "@rpath,-install_name "${PREFIX}/lib,g'
 62SUBST_SED.darwin+= -e 's,-install_name "\$$,-install_name "${PREFIX}/lib/\$$,g'
62 63
63# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar. 64# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar.
64. if ${OPSYS} == "SunOS" 65. if ${OPSYS} == "SunOS"
65TOOLS_PLATFORM.tar= #empty 66TOOLS_PLATFORM.tar= #empty
66. include "../../mk/compiler.mk" 67. include "../../mk/compiler.mk"
67. if !empty(CC_VERSION:Mgcc-4.[6-9]*) 68. if !empty(CC_VERSION:Mgcc-4.[6-9]*)
68BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600 69BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600
69. endif 70. endif
70. endif 71. endif
71 72
72. if ${OPSYS} == "Darwin" 73. if ${OPSYS} == "Darwin"
73# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs 74# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs
74# the native libtool from /Developer/usr/bin or /usr/bin. 75# the native libtool from /Developer/usr/bin or /usr/bin.