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 | 2347df5518184e316028bf90a0d032ee71028b63 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /net | |
| parent | e5a1b353192b781a2b5c36eca0f963c97d681caa (diff) | |
| download | pkgsrc-2347df5518184e316028bf90a0d032ee71028b63.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 'net')
| -rw-r--r-- | net/bind9-current/Makefile | 4 | ||||
| -rw-r--r-- | net/bind9/Makefile | 4 | ||||
| -rw-r--r-- | net/scli/Makefile | 4 | ||||
| -rw-r--r-- | net/waste/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/net/bind9-current/Makefile b/net/bind9-current/Makefile index 7af367532a6..6b97d126785 100644 --- a/net/bind9-current/Makefile +++ b/net/bind9-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/05/15 21:00:57 itojun Exp $ +# $NetBSD: Makefile,v 1.45 2004/08/27 06:29:09 jlam Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= bind-${BIND_VERSION} @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libtool=yes \ --sysconfdir=/etc \ --localstatedir=/var -#LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib +#LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib # use external OpenSSL. comment out the following line and the buildlink # include at the bottom to use OpenSSL shipped with BIND9. CONFIGURE_ARGS+=--with-openssl=${SSLBASE} diff --git a/net/bind9/Makefile b/net/bind9/Makefile index 45ebb567a33..c56ce96d1e1 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/04/15 20:13:20 tron Exp $ +# $NetBSD: Makefile,v 1.60 2004/08/27 06:29:09 jlam Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= bind-${BIND_VERSION} @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libtool=yes \ --sysconfdir=/etc \ --localstatedir=/var -#LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib +#LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib # use external OpenSSL. comment out the following line and the buildlink # include at the bottom to use OpenSSL shipped with BIND9. CONFIGURE_ARGS+=--with-openssl=${SSLBASE} diff --git a/net/scli/Makefile b/net/scli/Makefile index c0f7dba1f3d..1144872cad7 100644 --- a/net/scli/Makefile +++ b/net/scli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/25 07:40:23 snj Exp $ +# $NetBSD: Makefile,v 1.12 2004/08/27 06:29:09 jlam Exp $ # DISTNAME= scli-0.2.12 @@ -24,7 +24,7 @@ INFO_FILES= scli.info .for _p_ in ncurses readline CPPFLAGS+= -I${BUILDLINK_PREFIX.${_p_}}/include -LDFLAGS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.${_p_}}/lib +LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${_p_}}/lib LDFLAGS+= -L${BUILDLINK_PREFIX.${_p_}}/lib .endfor diff --git a/net/waste/Makefile b/net/waste/Makefile index c207926812b..c372f7bdce6 100644 --- a/net/waste/Makefile +++ b/net/waste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/18 07:21:49 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/08/27 06:29:09 jlam Exp $ # DISTNAME= waste-source @@ -26,7 +26,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} USE_BUILDLINK3= yes -MAKE_ENV+= LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib" +MAKE_ENV+= LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wastesrv ${PREFIX}/sbin/wastesrv |