From 64c83961643743b2423afc56e568e2cb05963660 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. --- lang/cim/Makefile | 4 ++-- lang/gcc3/distinfo | 4 ++-- lang/gcc3/patches/patch-ab | 4 ++-- lang/guile14/distinfo | 4 ++-- lang/guile14/patches/patch-ab | 4 ++-- lang/perl5/Makefile | 6 +++--- lang/perl58/Makefile | 6 +++--- lang/python20/Makefile | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'lang') diff --git a/lang/cim/Makefile b/lang/cim/Makefile index af3df13d770..d026a87fb23 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/05/11 03:33:57 snj Exp $ +# $NetBSD: Makefile,v 1.18 2004/08/27 06:29:08 jlam Exp $ DISTNAME= cim-3.30 CATEGORIES= lang @@ -20,7 +20,7 @@ SUBST_STAGE.x= post-patch SUBST_FILES.x= src/cimcomp.c SUBST_SED.x= -e "s|SCC|\"${CC}\"|" SUBST_SED.x+= -e "s|SCFLAGS|\"${CFLAGS} -I${PREFIX}/include\"|" -SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib\"|" +SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib\"|" SUBST_SED.x+= -e "s|= LIBDIR|= \"${PREFIX}/lib\"|" SUBST_SED.x+= -e "s|= INCLUDEDIR|= \"${PREFIX}/include\"|" diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo index e9590301f98..292939a3670 100644 --- a/lang/gcc3/distinfo +++ b/lang/gcc3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2004/07/02 15:40:01 drochner Exp $ +$NetBSD: distinfo,v 1.20 2004/08/27 06:29:08 jlam Exp $ SHA1 (gcc-3.3.4.tar.bz2) = f1690df8d2f0c60ada0c8d0c9c350063aa00f705 Size (gcc-3.3.4.tar.bz2) = 23331664 bytes SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36 -SHA1 (patch-ab) = f0795e3792cd5200140bc19e291a2616b7d31468 +SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741 SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515 SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab index e6b7c3f8deb..2e5792f6503 100644 --- a/lang/gcc3/patches/patch-ab +++ b/lang/gcc3/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $ +$NetBSD: patch-ab,v 1.6 2004/08/27 06:29:08 jlam Exp $ --- gcc/Makefile.in.orig Tue Jan 28 16:54:07 2003 +++ gcc/Makefile.in Sat May 24 13:01:38 2003 @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $ # Language-independent files. DRIVER_DEFINES = \ -+ -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(prefix)/lib\"" \ ++ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/lib\"" \ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ -DDEFAULT_TARGET_VERSION=\"$(version)\" \ diff --git a/lang/guile14/distinfo b/lang/guile14/distinfo index f5ead04a43f..f72aff2fc98 100644 --- a/lang/guile14/distinfo +++ b/lang/guile14/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2004/05/02 03:19:50 snj Exp $ +$NetBSD: distinfo,v 1.4 2004/08/27 06:29:08 jlam Exp $ SHA1 (guile-1.4.1.tar.gz) = 81a91ea7480ca06d1aeda94b90a89b27e9bdea7a Size (guile-1.4.1.tar.gz) = 1502840 bytes SHA1 (patch-aa) = 22a9181066193cadc3663ae43d42e9f81d55c8e1 -SHA1 (patch-ab) = 5ecfcacba60cc509682ff5482906b115a6e90ddc +SHA1 (patch-ab) = e970c1467184d2012cbaa6975bef4e24249113a9 SHA1 (patch-ad) = c692027caed122ef840a9ef3bf78eb125b26441e SHA1 (patch-ae) = 98174a540753d1eb5ac9071fb3ebd073158d8e93 diff --git a/lang/guile14/patches/patch-ab b/lang/guile14/patches/patch-ab index 93a75cbc244..b00dbdff132 100644 --- a/lang/guile14/patches/patch-ab +++ b/lang/guile14/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2004/05/02 03:19:50 snj Exp $ +$NetBSD: patch-ab,v 1.2 2004/08/27 06:29:08 jlam Exp $ --- libguile/Makefile.in.orig 2004-04-28 20:56:11.000000000 -0700 +++ libguile/Makefile.in 2004-04-28 20:59:32.000000000 -0700 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2004/05/02 03:19:50 snj Exp $ guile_SOURCES = guile.c -guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} -+guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} -Wl,${RPATH_FLAG}${PREFIX}/lib ++guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} ${COMPILER_RPATH_FLAG}${PREFIX}/lib guile_LDFLAGS = @DLPREOPEN@ libguile_la_SOURCES = \ diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index d606f492122..6bc0cc8c481 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2004/07/03 14:13:06 wiz Exp $ +# $NetBSD: Makefile,v 1.85 2004/08/27 06:29:08 jlam Exp $ .include "../../lang/perl5/Makefile.common" @@ -98,9 +98,9 @@ LOCINCPATH= ${LOCALBASE}/include # flags to the link command in the right way. # .if ${OBJECT_FMT} == "a.out" -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${RPATH_FLAG}/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g} .else -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,${RPATH_FLAG}/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g} .endif FIX_RPATH+= LOCLIBRPATHFLAGS diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index 4fe5b87c20a..747fa1af01f 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/06/25 17:41:47 abs Exp $ +# $NetBSD: Makefile,v 1.48 2004/08/27 06:29:08 jlam Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -168,9 +168,9 @@ LOCINCPATH= ${LOCALBASE}/include # flags to the link command in the right way. # .if ${OBJECT_FMT} == "a.out" -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${RPATH_FLAG}/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g} .elif ${OBJECT_FMT} == "ELF" -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,${RPATH_FLAG}/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g} .else LOCLIBRPATHFLAGS= # empty .endif diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 19c3508e339..6bbc132c474 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/07/22 09:16:03 recht Exp $ +# $NetBSD: Makefile,v 1.19 2004/08/27 06:29:08 jlam Exp $ # DISTNAME= Python-2.0.1 @@ -33,7 +33,7 @@ SCRIPTS_ENV+= 'OPT=${CFLAGS}' SSLFLAGS= -DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \ -L${BUILDLINK_PREFIX.openssl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto FIX_RPATH+= SSLFLAGS # Handle the module setup file: @@ -43,7 +43,7 @@ FIX_RPATH+= SSLFLAGS .if ${OPSYS} == "SunOS" ZOULARIS?= ${PREFIX}/bsd -MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib ${RPATH_FLAG}${ZOULARIS}/lib +MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib ${COMPILER_RPATH_FLAG}${ZOULARIS}/lib FIX_RPATH+= MODADD .endif -- cgit v1.2.3