summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/bsd.pkg.mk21
-rw-r--r--mk/defs.Darwin.mk3
-rw-r--r--mk/defs.FreeBSD.mk3
-rw-r--r--mk/defs.IRIX.mk3
-rw-r--r--mk/defs.Linux.mk3
-rw-r--r--mk/defs.NetBSD.mk3
-rw-r--r--mk/defs.OpenBSD.mk3
-rw-r--r--mk/defs.SunOS.mk3
8 files changed, 18 insertions, 24 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 91621f420e7..90a625e74fd 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1095 2002/12/03 18:57:53 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1096 2002/12/03 19:11:30 agc Exp $
#
# This file is in the public domain.
#
@@ -351,21 +351,13 @@ M4?= /usr/bin/m4
.if defined(USE_X11)
X11_LDFLAGS= # empty
. if ${_USE_RPATH} == "yes"
-. if ${OPSYS} == "IRIX"
-X11_LDFLAGS+= -Wl,-rpath,${X11BASE}/lib
-. else
-X11_LDFLAGS+= -Wl,-R${X11BASE}/lib
-. endif
+X11_LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${X11BASE}/lib
. endif
X11_LDFLAGS+= -L${X11BASE}/lib
LDFLAGS+= ${X11_LDFLAGS}
.endif
.if ${_USE_RPATH} == "yes"
-. if ${OPSYS} == "IRIX"
-LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib
-. else
-LDFLAGS+= -Wl,-R${LOCALBASE}/lib
-. endif
+LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${LOCALBASE}/lib
.else
. if empty(USE_BUILDLINK2:M[nN][oO])
LDFLAGS:= ${LDFLAGS:N*-Wl,-R*:N*-rpath*}
@@ -589,13 +581,8 @@ MESSAGE_SUBST+= PKGNAME=${PKGNAME} \
MESSAGE_SUBST_SED= ${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}
.endif
-.if ${OPSYS} == "IRIX"
PKGCONFIG_OVERRIDE_SED= \
- '-e s|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,-rpath,\2 -L\2\3|'
-.else
-PKGCONFIG_OVERRIDE_SED= \
- '-e s|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|'
-.endif
+ '-e s|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1-Wl,${_OPSYS_RPATH_NAME}\2 -L\2\3|'
# Latest version of digest(1) required for pkgsrc
DIGEST_REQD= 20010302
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 84db481783f..97e1581b93f 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.33 2002/12/03 18:57:52 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.34 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the Darwin operating system.
@@ -83,6 +83,7 @@ _OPSYS_HAS_GMAKE= yes # GNU make is standard
_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required
+_OPSYS_RPATH_NAME= # no name of symbol in rpath directive to linker
_PATCH_BACKUP_ARG= -V simple -b -z # switch to patch(1) for backup suffix
_PREFORMATTED_MAN_DIR= cat # directory where catman pages are
_USE_RPATH= no # don't add rpath to LDFLAGS
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index f3d7541584e..39f0139f4e8 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.4 2002/12/03 18:57:52 agc Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.5 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -95,6 +95,7 @@ _OPSYS_HAS_GMAKE= no # GNU make is not standard
_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb10 # base version of libtool required
+_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_PATCH_BACKUP_ARG= -V simple -b # switch to patch(1) for backup suffix
_PREFORMATTED_MAN_DIR= cat # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index c3e18d712de..d122e513212 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.2 2002/12/03 18:57:52 agc Exp $
+# $NetBSD: defs.IRIX.mk,v 1.3 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the IRIX operating system.
@@ -95,6 +95,7 @@ _OPSYS_HAS_GMAKE= no # GNU make is not standard
_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required
+_OPSYS_RPATH_NAME= -path, # name of symbol in rpath directive to linker
_PREFORMATTED_MAN_DIR= man # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 89fe1b917c6..b53202367d0 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.33 2002/12/03 18:57:52 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.34 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the Linux operating system.
@@ -85,6 +85,7 @@ _OPSYS_HAS_GMAKE= yes # GNU make is standard
_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required
+_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_PATCH_BACKUP_ARG= -b -V simple -z # switch to patch(1) for backup suffix
_PREFORMATTED_MAN_DIR= cat # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 087f035dc36..f7659e60054 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.33 2002/12/03 18:57:52 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.34 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -95,6 +95,7 @@ _OPSYS_HAS_GMAKE= no # GNU make is not standard
_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required
+_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_PATCH_BACKUP_ARG= -V simple -b # switch to patch(1) for backup suffix
_PREFORMATTED_MAN_DIR= cat # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 5473bbe5eba..5b940fc1b47 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.2 2002/12/03 18:57:53 agc Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.3 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -95,6 +95,7 @@ _OPSYS_HAS_GMAKE= no # GNU make is not standard
_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required
+_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_PATCH_BACKUP_ARG= -V simple -b # switch to patch(1) for backup suffix
_PREFORMATTED_MAN_DIR= cat # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index a73ec5176ec..025ba12cf51 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.36 2002/12/03 18:57:53 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.37 2002/12/03 19:11:31 agc Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -99,6 +99,7 @@ _OPSYS_HAS_GMAKE= no # GNU make is not standard
_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required
+_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_PATCH_BACKUP_ARG= -V simple -z # switch to patch(1) for backup suffix
_PREFORMATTED_MAN_DIR= man # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 03:07:43 +0000