boost is not using -mt for libs any longer, so don't substitute back.

Pass down -rpath as a single option to prevent it from being mangled up.
This commit is contained in:
joerg 2009-10-30 19:29:54 +00:00
parent e5620ebfd9
commit ac3d0714eb

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/07/08 18:09:25 hasso Exp $
# $NetBSD: Makefile,v 1.5 2009/10/30 19:29:54 joerg Exp $
DISTNAME= xsd-3.2.0+dep
EXTRACT_SUFX= .tar.bz2
@ -16,14 +16,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= bash gmake gm4
USE_LANGUAGES+= c++
SUBST_CLASSES+= boost
SUBST_STAGE.boost= post-configure
SUBST_FILES.boost= */*/*/*/*/stub.make
SUBST_SED.boost= -e 's|-lboost_date_time|-lboost_date_time-mt|g'
SUBST_SED.boost+= -e 's|-lboost_filesystem|-lboost_filesystem-mt|g'
SUBST_SED.boost+= -e 's|-lboost_regex|-lboost_regex-mt|g'
SUBST_SED.boost+= -e 's|-lboost_serialization|-lboost_serialization-mt|g'
SUBST_CLASSES+= rpath
SUBST_STAGE.rpath= post-configure
SUBST_FILES.rpath= */*/*/configuration-dynamic.make
@ -31,7 +23,7 @@ SUBST_SED.rpath= -e 's|cxx_rpath[ ]*:=[ ]*n|cxx_rpath := y|g'
do-build:
# XXX: rapth needs a better hack. TODO: add optimization
cd ${WRKSRC} && LDFLAGS="-Wl,-rpath ${PREFIX}/lib" ./build.sh
cd ${WRKSRC} && LDFLAGS="-Wl,-rpath,${PREFIX}/lib" ./build.sh
do-install:
cd ${WRKSRC} && MAKEFLAGS="install_prefix=${DESTDIR}${PREFIX} \