diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
| commit | ca7093842870728d22dde1258798b1704c53ca18 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /print | |
| parent | 49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff) | |
| download | pkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz | |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'print')
| -rw-r--r-- | print/ghostscript-gnu/Makefile.common | 4 | ||||
| -rw-r--r-- | print/ghostscript-nox11/Makefile.common | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common index 284faf45c90..89d3d216b27 100644 --- a/print/ghostscript-gnu/Makefile.common +++ b/print/ghostscript-gnu/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/04/24 22:46:11 jlam Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/08/27 06:29:10 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 7.07 @@ -55,7 +55,7 @@ MAKE_FLAGS+= XCFLAGS="${CFLAGS}" MAKE_FLAGS+= XLDFLAGS="${LDFLAGS}" .if ${OPSYS} == "SunOS" -LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib +LDFLAGS+= -L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib .endif REPLACE_PERL= lib/fixmswrd.pl diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index 18bd249c0ec..577bdac85b1 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.54 2004/05/09 04:14:51 snj Exp $ +# $NetBSD: Makefile.common,v 1.55 2004/08/27 06:29:10 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -142,7 +142,7 @@ GCC_REQD+= 3.0 .endif .if defined(ZOULARISBASE) -LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib +LDFLAGS+= -L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib .endif .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") @@ -159,7 +159,7 @@ MAKE_FLAGS+= GS_DISPLAY_DEVICE="${GS_DISPLAY_DEVICE}" MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS="${XLIBS}" .if ${OPSYS} == "SunOS" -LDFLAGS+= -L${LOCALBASE}/bsd/lib -Wl,${RPATH_FLAG}${LOCALBASE}/bsd/lib +LDFLAGS+= -L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib .endif # Define whether this platform has floating point hardware: |