diff options
| author | tron <tron> | 2003-03-23 09:40:48 +0000 |
|---|---|---|
| committer | tron <tron> | 2003-03-23 09:40:48 +0000 |
| commit | ce0c3db3e6fb870ddd25f75f3ab511716ffa4887 (patch) | |
| tree | a956515902f6fa78b00a72eb7e142dda80173b25 | |
| parent | 3089ae4eeb697c924bcb17cd637d21cbe4d51258 (diff) | |
| download | pkgsrc-ce0c3db3e6fb870ddd25f75f3ab511716ffa4887.tar.gz | |
Add "${LOCALBASE}/lib" before "${X11BASE}/lib" to the runtime library
search path. This stop package applications from picking up e.g.
XFree86 4.3.0's "expat", "fontconfig" or "Xt2" library also they
are supposed to use the packaged version.
Based on a suggestion by Christopher Richards.
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f1388cc6f4c..18405f3ce06 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1155 2003/03/22 18:18:28 dmcmahill Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1156 2003/03/23 09:40:48 tron Exp $ # # This file is in the public domain. # @@ -270,15 +270,15 @@ SHCOMMENT?= ${ECHO_MSG} >/dev/null '***' DISTINFO_FILE?= ${.CURDIR}/distinfo FIX_RPATH+= LIBS +LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib .if defined(USE_X11) X11_LDFLAGS= # empty X11_LDFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib X11_LDFLAGS+= -L${X11BASE}/lib LDFLAGS+= ${X11_LDFLAGS} .endif -LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib -LDFLAGS+= -L${LOCALBASE}/lib -FIX_RPATH+= X11_LDFLAGS LDFLAGS +FIX_RPATH+= LDFLAGS MAKE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" M4="${M4}" YACC="${YACC}" |