Tue Apr 14 09:06:32 2015 UTC ()
Enforce using the native libtool on Darwin for the cwrappers case too.


(jperkin)
diff -r1.49 -r1.50 pkgsrc/meta-pkgs/boost/Makefile.common
cvs diff -r1.49 -r1.50 pkgsrc/meta-pkgs/boost/Makefile.common (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/Makefile.common 2014/12/15 11:46:35 1.49
+++ pkgsrc/meta-pkgs/boost/Makefile.common 2015/04/14 09:06:32 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.49 2014/12/15 11:46:35 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.50 2015/04/14 09:06:32 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-python/Makefile 8# used by devel/boost-python/Makefile
9 9
10BOOST_PACKAGE?= undefined 10BOOST_PACKAGE?= undefined
11BOOST_COMMENT?= undefined 11BOOST_COMMENT?= undefined
12BOOST_VERSION= 1.57.0 12BOOST_VERSION= 1.57.0
13BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} 13BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//}
14 14
@@ -63,30 +63,33 @@ SUBST_SED.darwin= -e 's,-install_name ", @@ -63,30 +63,33 @@ SUBST_SED.darwin= -e 's,-install_name ",
63# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar. 63# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar.
64. if ${OPSYS} == "SunOS" 64. if ${OPSYS} == "SunOS"
65TOOLS_PLATFORM.tar= #empty 65TOOLS_PLATFORM.tar= #empty
66. include "../../mk/compiler.mk" 66. include "../../mk/compiler.mk"
67. if !empty(CC_VERSION:Mgcc-4.[6-9]*) 67. if !empty(CC_VERSION:Mgcc-4.[6-9]*)
68BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600 68BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600
69. endif 69. endif
70. endif 70. endif
71 71
72. if ${OPSYS} == "Darwin" 72. if ${OPSYS} == "Darwin"
73# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs 73# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs
74# the native libtool from /Developer/usr/bin or /usr/bin. 74# the native libtool from /Developer/usr/bin or /usr/bin.
75post-wrapper: 75post-wrapper:
 76 ${RM} -f ${WRAPPER_BINDIR}/libtool ${CWRAPPERS_BIN_DIR}/libtool
76. if exists(/Developer/usr/bin/libtool) 77. if exists(/Developer/usr/bin/libtool)
77 ln -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool 78 ${LN} -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool
 79 ${LN} -s /Developer/usr/bin/libtool ${CWRAPPERS_BIN_DIR}/libtool
78. else 80. else
79 ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool 81 ${LN} -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool
 82 ${LN} -s /usr/bin/libtool ${CWRAPPERS_BIN_DIR}/libtool
80. endif 83. endif
81. endif 84. endif
82 85
83# We can't do this at post-extract because the extract cookie will get a future 86# We can't do this at post-extract because the extract cookie will get a future
84# timestamp than the sources. If this happens, print-PLIST does not work. 87# timestamp than the sources. If this happens, print-PLIST does not work.
85pre-configure: 88pre-configure:
86 cd ${WRKSRC} && ${FIND} . -type f -print | ${XARGS} ${TOUCH} 89 cd ${WRKSRC} && ${FIND} . -type f -print | ${XARGS} ${TOUCH}
87 90
88# Generate a new user.hpp or use the installed one, depending on the package 91# Generate a new user.hpp or use the installed one, depending on the package
89# we are building. 92# we are building.
90. if ${BOOST_CONFIG} == "installed" 93. if ${BOOST_CONFIG} == "installed"
91. include "../../devel/boost-headers/buildlink3.mk" 94. include "../../devel/boost-headers/buildlink3.mk"
92do-configure: 95do-configure: