diff options
| author | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
| commit | 3ef633718c6eecbd852195de9329d45632a10352 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /databases/mysql-client | |
| parent | 1940384395085677c2036358dfcccfad791a4dd8 (diff) | |
| download | pkgsrc-3ef633718c6eecbd852195de9329d45632a10352.tar.gz | |
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
Diffstat (limited to 'databases/mysql-client')
| -rw-r--r-- | databases/mysql-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql-client/buildlink2.mk | 5 |
2 files changed, 5 insertions, 4 deletions
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" |