diff options
| author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
| commit | a771eb7968c94f0addf4db20c476555536382e51 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /misc | |
| parent | f11a46ae0626751873aec65de2e0341f70f610e7 (diff) | |
| download | pkgsrc-a771eb7968c94f0addf4db20c476555536382e51.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 'misc')
| -rw-r--r-- | misc/kdeutils/Makefile | 7 | ||||
| -rw-r--r-- | misc/openoffice/Makefile | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index 5bc9df93dbc..38a0bf8c079 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2003/03/12 21:02:25 jschauma Exp $ +# $NetBSD: Makefile,v 1.49 2003/03/14 19:37:50 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -23,7 +23,10 @@ CONFIGURE_ARGS= "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" + all_libraries="${KDE_LDFLAGS}" + +FIX_RPATH+= KDE_LDFLAGS +KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib .include "../../mk/bsd.prefs.mk" diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index b2c255d7584..d6bc88d5e3f 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/01/22 22:46:34 rh Exp $ +# $NetBSD: Makefile,v 1.34 2003/03/14 19:37:51 jlam Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -36,7 +36,7 @@ CXX= ${GCCPREFIX}/bin/c++ CPP= ${GCCPREFIX}/bin/cpp F77= ${GCCPREFIX}/bin/g77 PKG_FC= ${GCCPREFIX}/bin/g77 -LDFLAGS+= -R${GCCPREFIX}/lib +LDFLAGS+= ${RPATH_FLAG}${GCCPREFIX}/lib .endif BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison |