diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-03-01 15:22:25 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-03-01 15:22:25 +0000 |
| commit | 41156a0161e0f66f9924896eff6245515ff173f0 (patch) | |
| tree | b63f5afda437cdd2b5dad3d3995f3f80e4d6c68d /lang/gcc47 | |
| parent | 711a6d4e8660e0df29422a4c4bafc92df6b2f40c (diff) | |
| download | pkgsrc-41156a0161e0f66f9924896eff6245515ff173f0.tar.gz | |
Add GCC_TARGET_MACHINE, defaulting to MACHINE_GNU_ARCH, and use it in
preference to target_noncanonical so that the user can override if
required, e.g. in a multilib environment where target_noncanonical will
change based on current ABI.
Additionally, ensure that it comes first in the RPATH so that when
using USE_PKGSRC_GCC_RUNTIME with in-pkgsrc gcc we pick up the correct
libraries.
Diffstat (limited to 'lang/gcc47')
| -rw-r--r-- | lang/gcc47/Makefile | 8 | ||||
| -rw-r--r-- | lang/gcc47/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc47/patches/patch-gcc_Makefile.in | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index a3c8000961d..e51288ddbb4 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/02/05 07:12:23 adam Exp $ +# $NetBSD: Makefile,v 1.15 2013/03/01 15:22:25 jperkin Exp $ GCC_PKGNAME= gcc47 .include "version.mk" @@ -32,12 +32,18 @@ CONFIGURE_DIRS= ${OBJDIR} CONFIGURE_SCRIPT= ../${DISTNAME}/configure GCC_SUBPREFIX= ${GCC_PKGNAME} GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} +GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} INFO_FILES= yes UNLIMIT_RESOURCES+= datasize UNLIMIT_RESOURCES+= stacksize +SUBST_CLASSES+= vars +SUBST_STAGE.vars= pre-configure +SUBST_FILES.vars= gcc/Makefile.in +SUBST_VARS.vars= GCC_TARGET_MACHINE + .include "../../mk/bsd.prefs.mk" LANGS= c diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index 5fc2fad6ec6..511749d92ac 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2013/01/31 20:07:17 marino Exp $ +$NetBSD: distinfo,v 1.14 2013/03/01 15:22:25 jperkin Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -7,7 +7,7 @@ SHA1 (gcc-4.7.2.tar.bz2) = a464ba0f26eef24c29bcd1e7489421117fb9ee35 RMD160 (gcc-4.7.2.tar.bz2) = fc281ade14b47d2a9c2ced4f7082c74bfbae31c1 Size (gcc-4.7.2.tar.bz2) = 82884636 bytes SHA1 (patch-configure) = 51c0978c60baddd90ef7e512445fdef913c04e6c -SHA1 (patch-gcc_Makefile.in) = 1cf954d214a1d4a3fd4fece1f577f11b511e20ed +SHA1 (patch-gcc_Makefile.in) = ec7b99db19396d5012fa32f25c9620dc61c19825 SHA1 (patch-gcc_config.gcc) = efa4ecabd71bdec14d5dd1f8bb836116c7a9d6e9 SHA1 (patch-gcc_config_dragonfly-stdint.h) = 740dc819b446d5f1476506322c4b280ffdb5a6c0 SHA1 (patch-gcc_config_dragonfly.h) = 82f549cdc7543b4bf413a44d481ef42b10f59c82 diff --git a/lang/gcc47/patches/patch-gcc_Makefile.in b/lang/gcc47/patches/patch-gcc_Makefile.in index d041db18434..77ac8c7b9e7 100644 --- a/lang/gcc47/patches/patch-gcc_Makefile.in +++ b/lang/gcc47/patches/patch-gcc_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-gcc_Makefile.in,v 1.3 2012/11/16 01:03:54 joerg Exp $ +$NetBSD: patch-gcc_Makefile.in,v 1.4 2013/03/01 15:22:25 jperkin Exp $ -Add gcc libdir to a programs rpath so that _this gcc's_ support librarys +Add gcc libdir to a programs rpath so that _this gcc's_ support libraries are found. NOTE: the %M spec string is added by patch-gcc_gcc.c @@ -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 $(LINKER_RPATH_FLAG) $(prefix)/$(target_noncanonical)/lib/%M \"" \ ++ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG) $(libdir)/%M \"" \ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ |