diff options
| author | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
| commit | 64c83961643743b2423afc56e568e2cb05963660 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /meta-pkgs | |
| parent | b1d52ddb282f29c948118e6048aa57331cc442c0 (diff) | |
| download | pkgsrc-64c83961643743b2423afc56e568e2cb05963660.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 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/XFree86/Makefile.common | 6 | ||||
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index d23e6132a1f..bdadd2db59f 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2004/08/16 12:30:04 kristerw Exp $ +# $NetBSD: Makefile.common,v 1.18 2004/08/27 06:29:08 jlam Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -151,8 +151,8 @@ USE_LANGUAGES= c c++ . if !target(post-extract) GLOBAL_LDFLAGS= -L${LOCALBASE}/lib -L${X11ROOT}/lib \ - ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib \ - ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib + ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \ + ${COMPILER_RPATH_FLAG}${X11BASE}/lib post-extract: @${SED} \ diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index e027ebba3e0..e479d2ac682 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/08/16 12:27:23 kristerw Exp $ +# $NetBSD: Makefile.common,v 1.8 2004/08/27 06:29:08 jlam Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -145,8 +145,8 @@ USE_LANGUAGES= c c++ . if !target(post-extract) GLOBAL_LDFLAGS= -L${LOCALBASE}/lib -L${X11ROOT}/lib \ - ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib \ - ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib + ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \ + ${COMPILER_RPATH_FLAG}${X11BASE}/lib post-extract: @${SED} \ @@ -163,8 +163,7 @@ post-extract: -e "s|@LOCALBASE@|${LOCALBASE}|g" \ -e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \ -e "s|@WRKSRC@|${WRKSRC}|g" \ - -e "s|@_COMPILER_LD_FLAG@|${_COMPILER_LD_FLAG}|g" \ - -e "s|@RPATH_FLAG@|${RPATH_FLAG}|g" \ + -e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \ ${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def @${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util @${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util |