Add "$(prefix)/$(target_noncanonical)/lib/%M" to the RPATH gcc adds to

all programs and shared libraries.

Bump PKGREVISION.
This commit is contained in:
sbd 2012-09-13 07:19:11 +00:00
parent 98a1229778
commit 7deecdcf79
3 changed files with 6 additions and 6 deletions

View file

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.6 2012/08/20 07:22:09 sbd Exp $
# $NetBSD: Makefile,v 1.7 2012/09/13 07:19:11 sbd Exp $
GCC_PKGNAME= gcc47
.include "version.mk"
DISTNAME= gcc-${GCC_DIST_VERSION}
PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION}
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
EXTRACT_SUFX= .tar.bz2

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.8 2012/07/12 13:47:23 marino Exp $
$NetBSD: distinfo,v 1.9 2012/09/13 07:19:11 sbd Exp $
SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@ -7,7 +7,7 @@ SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82
RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4
Size (gcc-4.7.0.tar.bz2) = 82518546 bytes
SHA1 (patch-configure) = 51c0978c60baddd90ef7e512445fdef913c04e6c
SHA1 (patch-gcc_Makefile.in) = 2372899a37259c89281e6bd1223e39df9b53a7e3
SHA1 (patch-gcc_Makefile.in) = 9a941785a8551ba86f0b154093bfc30144046694
SHA1 (patch-gcc_config.gcc) = efa4ecabd71bdec14d5dd1f8bb836116c7a9d6e9
SHA1 (patch-gcc_config_dragonfly-stdint.h) = 740dc819b446d5f1476506322c4b280ffdb5a6c0
SHA1 (patch-gcc_config_dragonfly.h) = 82f549cdc7543b4bf413a44d481ef42b10f59c82

View file

@ -1,4 +1,4 @@
$NetBSD: patch-gcc_Makefile.in,v 1.1.1.1 2012/04/16 04:27:18 sbd Exp $
$NetBSD: patch-gcc_Makefile.in,v 1.2 2012/09/13 07:19:12 sbd Exp $
Add gcc libdir to a programs rpath so that _this gcc's_ support librarys
are found.
@ -11,7 +11,7 @@ NOTE: the %M spec string is added by patch-gcc_gcc.c
# Language-independent files.
DRIVER_DEFINES = \
+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(libdir)/%M $(LINKER_RPATH_FLAG)$(prefix)/$(target_noncanonical)/lib/%M \"" \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
-DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \