From ca7093842870728d22dde1258798b1704c53ca18 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 27 Aug 2004 06:29:06 +0000 Subject: 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} ", 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. --- time/bbdate/distinfo | 4 ++-- time/bbdate/patches/patch-aa | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'time') diff --git a/time/bbdate/distinfo b/time/bbdate/distinfo index 0aa35338d52..fe232e58eb3 100644 --- a/time/bbdate/distinfo +++ b/time/bbdate/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/18 15:53:15 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2004/08/27 06:29:10 jlam Exp $ SHA1 (bbdate-0.2.4.tar.gz) = c48052eec337dfdca5fdfe6b87cd2bccf3a03921 Size (bbdate-0.2.4.tar.gz) = 60644 bytes -SHA1 (patch-aa) = 424a58820cd2a14aaeedacbb9223abb034509e62 +SHA1 (patch-aa) = f3dcd43ff15b065b2e4e63a07743178490c1634d SHA1 (patch-ab) = 4ba9c43992b476e8d515fb56fb18dad586533a3a diff --git a/time/bbdate/patches/patch-aa b/time/bbdate/patches/patch-aa index 925979f1c99..880082a79b2 100644 --- a/time/bbdate/patches/patch-aa +++ b/time/bbdate/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/18 15:53:15 jschauma Exp $ +$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $ --- Makefile.in.orig Fri Jul 18 11:31:51 2003 +++ Makefile.in Fri Jul 18 11:32:49 2003 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/18 15:53:15 jschauma Exp $ DEFS = @DEFS@ -I. -I$(srcdir) -LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -Wl,${RPATH_FLAG}${X11PREFIX}/lib ++LDFLAGS = @LDFLAGS@ ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib LIBS = @LIBS@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ -- cgit v1.2.3