diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/freetds/buildlink2.mk | 5 | ||||
| -rw-r--r-- | databases/mysql-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql-client/buildlink2.mk | 5 | ||||
| -rw-r--r-- | databases/p5-DBD-Sybase/Makefile | 4 | ||||
| -rw-r--r-- | databases/php3-mysql/Makefile | 4 | ||||
| -rw-r--r-- | databases/php4-mysql/Makefile | 4 | ||||
| -rw-r--r-- | databases/sqsh/Makefile | 4 |
7 files changed, 16 insertions, 14 deletions
diff --git a/databases/freetds/buildlink2.mk b/databases/freetds/buildlink2.mk index 223f49fa41d..2fcb8970c13 100644 --- a/databases/freetds/buildlink2.mk +++ b/databases/freetds/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 09:40:00 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2003/03/14 19:37:33 jlam Exp $ .if !defined(FREETDS_BUILDLINK2_MK) FREETDS_BUILDLINK2_MK= # defined @@ -14,7 +14,8 @@ BUILDLINK_FILES.freetds+= freetds/lib/* BUILDLINK_CPPFLAGS.freetds= -I${BUILDLINK_PREFIX.freetds}/freetds/include BUILDLINK_LDFLAGS.freetds= -L${BUILDLINK_PREFIX.freetds}/freetds/lib -BUILDLINK_LDFLAGS.freetds+= -Wl,-R${BUILDLINK_PREFIX.freetds}/freetds/lib +BUILDLINK_LDFLAGS.freetds+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.freetds}/freetds/lib +FIX_RPATH+= BUILDLINK_LDFLAGS.freetds BUILDLINK_TARGETS+= freetds-buildlink diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index b3e53de13b9..77e23bdd9e3 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2003/01/20 23:16:38 lukem Exp $ +# $NetBSD: Makefile.common,v 1.13 2003/03/14 19:37:34 jlam Exp $ DISTNAME= mysql-3.23.49 CATEGORIES= databases @@ -43,7 +43,7 @@ CPPFLAGS+= -Dunix USE_PERL5= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -LDFLAGS+= -Wl,-R${LOCALBASE}/lib/mysql +LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql post-extract: cd ${WRKSRC}; \ diff --git a/databases/mysql-client/buildlink2.mk b/databases/mysql-client/buildlink2.mk index 10cc78b1060..16ebecc9cf0 100644 --- a/databases/mysql-client/buildlink2.mk +++ b/databases/mysql-client/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2002/12/13 14:19:54 tron Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/03/14 19:37:34 jlam Exp $ .if !defined(MYSQL_CLIENT_BUILDLINK2_MK) MYSQL_CLIENT_BUILDLINK2_MK= # defined @@ -12,9 +12,10 @@ BUILDLINK_PREFIX.mysql-client_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.mysql-client= include/mysql/*.h BUILDLINK_FILES.mysql-client+= lib/mysql/libmysqlclient.* +FIX_RPATH+= BUILDLINK_LDFLAGS.mysql-client BUILDLINK_LDFLAGS.mysql-client= \ -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql .include "../../devel/zlib/buildlink2.mk" diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile index 6473d2ed580..153e240dc22 100644 --- a/databases/p5-DBD-Sybase/Makefile +++ b/databases/p5-DBD-Sybase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/10/27 19:41:53 seb Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/14 19:37:34 jlam Exp $ # DISTNAME= DBD-Sybase-0.94 @@ -14,7 +14,7 @@ COMMENT= perl DBI/DBD driver for Sybase/MS-SQL databases USE_BUILDLINK2= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/DBD/Sybase/.packlist -PERL5_LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.freetds}/freetds/lib +PERL5_LDFLAGS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.freetds}/freetds/lib MAKE_ENV+= SYBASE=${BUILDLINK_PREFIX.freetds}/freetds .include "../../databases/freetds/buildlink2.mk" diff --git a/databases/php3-mysql/Makefile b/databases/php3-mysql/Makefile index c6c038ede50..e8f338804f0 100644 --- a/databases/php3-mysql/Makefile +++ b/databases/php3-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/10/09 11:55:53 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2003/03/14 19:37:35 jlam Exp $ MODNAME= mysql CATEGORIES+= databases @@ -13,7 +13,7 @@ BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} MOD_CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -MOD_LDFLAGS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -R${LOCALBASE}/lib/mysql +MOD_LDFLAGS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql ${RPATH_FLAG}${LOCALBASE}/lib/mysql MOD_LIBS+= -lmysqlclient -lm .include "../../databases/mysql-client/buildlink2.mk" diff --git a/databases/php4-mysql/Makefile b/databases/php4-mysql/Makefile index 8850f94b32d..7f26e316bc8 100644 --- a/databases/php4-mysql/Makefile +++ b/databases/php4-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/01/02 23:35:43 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/14 19:37:35 jlam Exp $ MODNAME= mysql CATEGORIES+= databases @@ -11,7 +11,7 @@ USE_BUILDLINK2= # defined EVAL_PREFIX+= MYSQLDIR=mysql-client CONFIGURE_ARGS+= --with-${MODNAME}=shared,${MYSQLDIR} -LDFLAGS+= -Wl,-R${LOCALBASE}/lib/mysql +LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql .include "../../databases/mysql-client/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index a6085e0f8a6..04d8f3fcf6a 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/10/12 09:40:38 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/03/14 19:37:36 jlam Exp $ DISTNAME= sqsh-1.7-src PKGNAME= sqsh-1.7 @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ENV+= SYBASE="${BUILDLINK_PREFIX.freetds}/${SYBASE}" SYBASE= freetds -LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.freetds}/${SYBASE}/lib +LDFLAGS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.freetds}/${SYBASE}/lib CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include" CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib" |