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 /graphics | |
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 'graphics')
-rw-r--r-- | graphics/avifile-devel/Makefile | 9 | ||||
-rw-r--r-- | graphics/imlib/Makefile | 4 | ||||
-rw-r--r-- | graphics/jhead/Makefile | 4 | ||||
-rw-r--r-- | graphics/kdegraphics/Makefile | 7 | ||||
-rw-r--r-- | graphics/ogle/buildlink2.mk | 4 | ||||
-rw-r--r-- | graphics/png2html/Makefile | 5 | ||||
-rw-r--r-- | graphics/pstoedit/Makefile | 4 |
7 files changed, 21 insertions, 16 deletions
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index d43ec73b823..b1b3cb9c8d5 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2003/02/13 16:31:24 fredb Exp $ +# $NetBSD: Makefile,v 1.31 2003/03/14 19:37:39 jlam Exp $ # DISTNAME= avifile-0.6.20010814 @@ -53,9 +53,10 @@ AVIFILE_USE_QT?= NO PLIST_SRC= ${PKGDIR}/PLIST.qt PLIST_SRC+= ${PKGDIR}/PLIST -CXXFLAGS+= -Wl,-R${QTDIR}/lib -CXXFLAGS+= -Wl,-R${LOCALBASE}/lib -CXXFLAGS+= -Wl,-R${X11BASE}/lib +CXXFLAGS+= -Wl,${RPATH_FLAG}${QTDIR}/lib +CXXFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib +CXXFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib +FIX_RPATH+= CXXFLAGS CONFIGURE_ARGS+= --enable-qt CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}" diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index b437e80ad1f..f8ccf8b2392 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2003/01/28 22:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.74 2003/03/14 19:37:40 jlam Exp $ # DISTNAME= imlib-1.9.14 @@ -41,7 +41,7 @@ CONF_FILES+= ${EGDIR}/im_palette-tiny.pal \ # The following ensures that `imlib-config --libs' includes the correct # linker flags for linking the X11 libs. # -X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib +X_LDFLAGS= ${X11_LDFLAGS} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile index ef82c407d02..3d06f42a240 100644 --- a/graphics/jhead/Makefile +++ b/graphics/jhead/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/01/09 15:28:07 mycroft Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/14 19:37:40 jlam Exp $ # DISTNAME= jhead-1.9 @@ -9,7 +9,7 @@ MAINTAINER= veego@netbsd.org HOMEPAGE= http://www.sentex.net/~mwandel/jhead/ COMMENT= Extract EXIF header from JPEG image -LIBS= -lm -L${BUILDLINK_PREFIX.jpeg}/lib -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib -ljpeg +LIBS= -lm -L${BUILDLINK_PREFIX.jpeg}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.jpeg}/lib -ljpeg USE_BUILDLINK2= yes diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index 913809b266b..aa4b3fe3cc8 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2003/03/13 12:13:17 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2003/03/14 19:37:40 jlam Exp $ # DISTNAME= kdegraphics-1.1.2 @@ -26,6 +26,9 @@ CONFIGURE_ARGS= "--datadir=${KDEBASEDIR}/share/kde" \ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${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.pkg.mk" diff --git a/graphics/ogle/buildlink2.mk b/graphics/ogle/buildlink2.mk index 1758b4d1e97..6d7e45a6502 100644 --- a/graphics/ogle/buildlink2.mk +++ b/graphics/ogle/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/09/22 10:06:00 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/03/14 19:37:41 jlam Exp $ .if !defined(OGLE_BUILDLINK2_MK) OGLE_BUILDLINK2_MK= # defined @@ -14,7 +14,7 @@ BUILDLINK_FILES.ogle+= lib/ogle/libmsgevents.* BUILDLINK_FILES.ogle+= lib/ogle/libdvdcontrol.* BUILDLINK_LDFLAGS.ogle= -L${BUILDLINK_PREFIX.ogle}/lib/ogle -BUILDLINK_LDFLAGS.ogle+= -Wl,-R${BUILDLINK_PREFIX.ogle}/lib/ogle +BUILDLINK_LDFLAGS.ogle+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.ogle}/lib/ogle BUILDLINK_TARGETS+= ogle-buildlink diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile index 05a8b39e068..21f33113a0f 100644 --- a/graphics/png2html/Makefile +++ b/graphics/png2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/10/09 11:47:46 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/14 19:37:42 jlam Exp $ # DISTNAME= png2html-1.1 @@ -11,7 +11,8 @@ HOMEPAGE= http://www.engr.mun.ca/~holden/png2html.html COMMENT= Takes a PNG image and transforms it to a web page USE_BUILDLINK2= YES -CFLAGS+= -L${BUILDLINK_PREFIX.gd}/lib -Wl,-R${BUILDLINK_PREFIX.gd}/lib +FIX_RPATH+= CFLAGS +CFLAGS+= -L${BUILDLINK_PREFIX.gd}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.gd}/lib do-install: ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/png2html diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index f1676bd209f..06d7ce477f1 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/09/13 06:53:35 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2003/03/14 19:37:42 jlam Exp $ DISTNAME= pstoedit_3_31 PKGNAME= pstoedit-3.31 @@ -23,7 +23,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11PREFIX}/lib/libplotter.la" CONFIGURE_ENV+= CXXFLAGS="${CFLAGS} -Dunix" -CONFIGURE_ENV+= LDLIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= LDLIBS="${X11_LDFLAGS}" CONFIGURE_ENV+= AWK=${AWK} GS=${LOCALBASE}/bin/gs CONFIGURE_ARGS+=--datadir=${PREFIX}/share CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit # plugin dir -- unused for now |