From c67635060cd54b4f914d016d2d93bdcc9c66c834 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. --- chat/ser/distinfo | 4 ++-- chat/ser/patches/patch-aa | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chat/ser') diff --git a/chat/ser/distinfo b/chat/ser/distinfo index 4634f7ba0ec..2e3eaa02bb6 100644 --- a/chat/ser/distinfo +++ b/chat/ser/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2004/05/09 23:58:19 wiz Exp $ +$NetBSD: distinfo,v 1.5 2004/08/27 06:29:07 jlam Exp $ SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d Size (ser-0.8.10_src.tar.gz) = 931150 bytes -SHA1 (patch-aa) = ebee20df3766908a6dc6b031f703f3ce60b45071 +SHA1 (patch-aa) = 40c28c6855a99468b5081eb21007d6b0e6744527 SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d diff --git a/chat/ser/patches/patch-aa b/chat/ser/patches/patch-aa index e7c522f949f..e7ce8ecec5a 100644 --- a/chat/ser/patches/patch-aa +++ b/chat/ser/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $ +$NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $ --- Makefile.defs.orig 2002-11-12 17:21:28.000000000 +0000 +++ Makefile.defs 2003-09-16 15:42:29.000000000 +0100 @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $ endif endif #mode=release -+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib ++LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib #*FLAGS used for compiling the modules -- cgit v1.2.3