diff options
| author | jmmv <jmmv> | 2011-10-14 02:05:00 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2011-10-14 02:05:00 +0000 |
| commit | 1792c9032d0fed9a5070f9c4e4b0489f1342dd5c (patch) | |
| tree | b71067f1d657e1aaf21f11d10483446a8c70c31c /devel | |
| parent | bb80346a335f1eff78f6cf1c9a40b33e1838470e (diff) | |
| download | pkgsrc-1792c9032d0fed9a5070f9c4e4b0489f1342dd5c.tar.gz | |
Use rpaths when linking.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/vera++/Makefile | 11 | ||||
| -rw-r--r-- | devel/vera++/distinfo | 4 | ||||
| -rw-r--r-- | devel/vera++/patches/patch-aa | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/devel/vera++/Makefile b/devel/vera++/Makefile index 94c24f8efc3..1afa45ab4f3 100644 --- a/devel/vera++/Makefile +++ b/devel/vera++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/10/13 18:43:51 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2011/10/14 02:05:00 jmmv Exp $ # DISTNAME= vera++-1.1.1 @@ -18,10 +18,15 @@ USE_TOOLS+= gmake pax CXXFLAGS+= -DVERA_ROOT=\"${PREFIX:Q}/share/vera++\" +LIBS_DIRS= -L${BUILDLINK_PREFIX.boost-libs:Q}/lib +LIBS_DIRS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.boost-libs:Q}/lib +LIBS_DIRS+= -L${BUILDLINK_PREFIX.tcl:Q}/lib +LIBS_DIRS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tcl:Q}/lib + MAKE_FLAGS+= BOOST_DIR=${BUILDLINK_PREFIX.boost-headers}/include -MAKE_FLAGS+= BOOSTLIB_DIR=${BUILDLINK_PREFIX.boost-libs}/lib +MAKE_FLAGS+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG} +MAKE_FLAGS+= LIBS_DIRS="${LIBS_DIRS}" MAKE_FLAGS+= TCLINCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include -MAKE_FLAGS+= TCLLIB_DIR=${BUILDLINK_PREFIX.tcl}/lib INSTALLATION_DIRS= bin share/doc/vera++ share/vera++ diff --git a/devel/vera++/distinfo b/devel/vera++/distinfo index a7f146652ef..499f9aef1ca 100644 --- a/devel/vera++/distinfo +++ b/devel/vera++/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/10/13 18:43:51 jmmv Exp $ +$NetBSD: distinfo,v 1.2 2011/10/14 02:05:00 jmmv Exp $ SHA1 (vera++-1.1.1.tar.gz) = fe3c14775b50a580d88872e0ada8602b39a2ae01 RMD160 (vera++-1.1.1.tar.gz) = d085fe4605930c7cf18ed2e8471b1771d08511e1 Size (vera++-1.1.1.tar.gz) = 53263 bytes -SHA1 (patch-aa) = aada15eb28d58718e30b151bb7d148d8f9d1dc05 +SHA1 (patch-aa) = c1cb077ec08e7a3b2d1f9ba40630bb7fce81bbaa SHA1 (patch-ab) = 1164e33cc69ddd87c9d4f8dc082ffdf2b7abad84 SHA1 (patch-ac) = e23a83a69620c50c4b29711b12982a22aec536fe diff --git a/devel/vera++/patches/patch-aa b/devel/vera++/patches/patch-aa index b7bc6cc98df..12f1f241c6e 100644 --- a/devel/vera++/patches/patch-aa +++ b/devel/vera++/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 2011/10/13 18:43:51 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2011/10/14 02:05:01 jmmv Exp $ The structures/lexer directory rebuilds part of Boost.Wave by attempting to access the raw Boost source files. This is not appropriate for a package, -so just link against the installed Boost.Wave library. +so just link against the installed Boost.Wave library. We set LIBS_DIRS +from our package Makefile to avoid dealing with rpaths here. --- src/Makefile.orig 2008-08-25 13:41:57.000000000 +0000 +++ src/Makefile @@ -12,7 +13,7 @@ so just link against the installed Boost.Wave library. -LIBS_DIRS = -L./structures/lexer -L${TCLLIB_DIR} -LIBS = -l${TCL_LIB} -llexer -+LIBS_DIRS = -L${BOOSTLIB_DIR} -L${TCLLIB_DIR} ++LIBS_DIRS = undefined +LIBS = -l${TCL_LIB} -lboost_wave -lboost_system ALL_OBJ = ${STRUCTURES_OBJ} ${PLUGINS_OBJ} |