diff options
| author | jschauma <jschauma> | 2002-12-23 22:33:14 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2002-12-23 22:33:14 +0000 |
| commit | 5570da52c9f83e2e115ea521c7ce852e2f807bd5 (patch) | |
| tree | 23660b3e76f9dc1d680cc88e53c71929dfe7ce2c | |
| parent | 05ac873c408d66831a2133cc438545b4e7bfa50e (diff) | |
| download | pkgsrc-5570da52c9f83e2e115ea521c7ce852e2f807bd5.tar.gz | |
Let's be consistent:
Always check for ${OPSYS} == "IRIX" (and not once for != and once for ==)
Always use "-Wl,-rpath,/path" rather than sometimes "-Wl,-rpath -Wl,/path"
and sometimes "-Wl,-rpath,/path".
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 6 | ||||
| -rw-r--r-- | mk/motif.buildlink2.mk | 10 | ||||
| -rw-r--r-- | mk/xaw.buildlink2.mk | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 6adea874ae6..5af8b7d5342 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.65 2002/12/23 17:31:15 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.66 2002/12/23 22:33:16 jschauma Exp $ # # An example package buildlink2.mk file: # @@ -58,7 +58,7 @@ CONFIGURE_ENV+= BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}" MAKE_ENV+= BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}" _BLNK_CPPFLAGS= -I${LOCALBASE}/include .if ${OPSYS} == "IRIX" -_BLNK_LDFLAGS= -L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib +_BLNK_LDFLAGS= -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib .else _BLNK_LDFLAGS= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib .endif @@ -96,7 +96,7 @@ _BLNK_X11_DIR= ${LOCALBASE}/share/x11-links . endif _BLNK_CPPFLAGS+= -I${X11BASE}/include .if ${OPSYS} == "IRIX" -_BLNK_LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib +_BLNK_LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib .else _BLNK_LDFLAGS+= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib .endif diff --git a/mk/motif.buildlink2.mk b/mk/motif.buildlink2.mk index d0668565cb1..1603f274624 100644 --- a/mk/motif.buildlink2.mk +++ b/mk/motif.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink2.mk,v 1.4 2002/12/02 17:07:28 jschauma Exp $ +# $NetBSD: motif.buildlink2.mk,v 1.5 2002/12/23 22:33:14 jschauma Exp $ # # USE_MOTIF12 # use a Motif-1.2-compatible installation, otherwise, assume @@ -150,12 +150,12 @@ MOTIFBASE= ${_MOTIFBASE} USE_X11?= # defined MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" MAKE_ENV+= MOTIFBASE="${_MOTIFBASE}" -.if ${OPSYS} != "IRIX" +.if ${OPSYS} == "IRIX" +LDFLAGS+= -Wl,-rpath -Wl,${_MOTIFBASE}/lib +MOTIFLIB?= -Wl,-rpath,${_MOTIFBASE}/lib -Wl,-rpath,${X11BASE}/lib -L${_MOTIFBASE}/lib -lXm -lXp +.else LDFLAGS+= -Wl,-R${_MOTIFBASE}/lib MOTIFLIB?= -Wl,-R${_MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${_MOTIFBASE}/lib -lXm -lXp -.else -LDFLAGS+= -Wl,-rpath -Wl,${_MOTIFBASE}/lib -MOTIFLIB?= -Wl,-rpath -Wl,${_MOTIFBASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${_MOTIFBASE}/lib -lXm -lXp .endif .endif # MOTIF_BUILDLINK2_MK diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk index 7056d324399..3d41ccc8d5c 100644 --- a/mk/xaw.buildlink2.mk +++ b/mk/xaw.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink2.mk,v 1.6 2002/12/02 17:07:28 jschauma Exp $ +# $NetBSD: xaw.buildlink2.mk,v 1.7 2002/12/23 22:33:14 jschauma Exp $ .if !defined(XAW_BUILDLINK2_MK) XAW_BUILDLINK2_MK= # defined @@ -20,7 +20,7 @@ BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw} .else BUILDLINK_PREFIX.Xaw?= ${X11BASE} . if ${OPSYS} == "IRIX" -LIBXAW?= -L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -lXaw +LIBXAW?= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lXaw . else LIBXAW?= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXaw . endif |