diff options
| author | sbd <sbd@pkgsrc.org> | 2012-05-08 02:59:16 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-05-08 02:59:16 +0000 |
| commit | a926e6cf958d0a5bbf6eb794c20140d0b54598cc (patch) | |
| tree | 6a811fcd3b7661087c562c92be0da15b6d7dd6da /lang/g95 | |
| parent | 4151bf4c5ac0d3ec02889dd45a6fadb1375c9440 (diff) | |
| download | pkgsrc-a926e6cf958d0a5bbf6eb794c20140d0b54598cc.tar.gz | |
Use ${host_alias} in path names so they match ${MACHINE_GNU_PLATFORM}
(E.g. *-linux-gnu vs. *-linux)
Diffstat (limited to 'lang/g95')
| -rw-r--r-- | lang/g95/distinfo | 7 | ||||
| -rw-r--r-- | lang/g95/patches/patch-ab | 13 | ||||
| -rw-r--r-- | lang/g95/patches/patch-ac | 15 |
3 files changed, 29 insertions, 6 deletions
diff --git a/lang/g95/distinfo b/lang/g95/distinfo index c1015436ef3..b1947af1475 100644 --- a/lang/g95/distinfo +++ b/lang/g95/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2011/02/19 16:06:31 rumko Exp $ +$NetBSD: distinfo,v 1.9 2012/05/08 02:59:16 sbd Exp $ SHA1 (g95-0.92/g95_source.tgz) = e6320fc80d8e388aad1fdbde53b2414353692b76 RMD160 (g95-0.92/g95_source.tgz) = ac00c4cdd6dc0b90ef865040ff338b7f2d9296d1 @@ -14,5 +14,6 @@ SHA1 (patch-.._gcc-4.0.3_gcc_config_i386_dragonfly64.h) = b228dbcdf7b5cf22d41d6f SHA1 (patch-.._gcc-4.0.3_gcc_config_t-dragonfly) = 9636163ffd359b2a0dbb0a7fec2ca1cf98032c3d SHA1 (patch-.._gcc-4.0.3_gcc_config_t-dragonfly-thread) = a7181b3061e32d3edd38c09eed34232a75de83cf SHA1 (patch-.._gcc-4.0.3_gcc_ginclude_stddef.h) = 5e18b132d36ca02dcfed0569297e7ad6b1eada26 -SHA1 (patch-ab) = 98cf305aa29487539160736e057dc19313f34a76 -SHA1 (patch-ac) = b5567c0d6969f84d2518a581c6517691aa4f5e67 +SHA1 (patch-ab) = 7275d8df3ba1621f3d496c386df999295f36f974 +SHA1 (patch-ac) = cc6811bb7ef29d9388a40851c403f8768b6f9e48 +SHA1 (patch-libf95.a-0.92_configure) = d17fc9fa66228489cfa5e49c23d4cfd32a91bfae diff --git a/lang/g95/patches/patch-ab b/lang/g95/patches/patch-ab index e6c6281d53d..b243486a065 100644 --- a/lang/g95/patches/patch-ab +++ b/lang/g95/patches/patch-ab @@ -1,7 +1,18 @@ -$NetBSD: patch-ab,v 1.5 2011/01/23 09:42:10 markd Exp $ +$NetBSD: patch-ab,v 1.6 2012/05/08 02:59:16 sbd Exp $ + +Use $(host_alias) as the program prefix so it matches ${MACHINE_GNU_PLATFORM} --- Makefile.in.orig 2009-02-17 16:46:06.000000000 +0000 +++ Makefile.in +@@ -1330,7 +1330,7 @@ clean-local: + rm -f options.tmp options.c options.h version.c + + install-exec-hook: +- mv $(DESTDIR)$(bindir)/g95$(EXEEXT) $(DESTDIR)$(bindir)/$(host)-g95$(EXEEXT) ++ mv $(DESTDIR)$(bindir)/g95$(EXEEXT) $(DESTDIR)$(bindir)/$(host_alias)-g95$(EXEEXT) + + install-data-hook: + -ln -sf f951$(EXEEXT) $(DESTDIR)@DEST_LIBDIR@/cc1 @@ -1341,8 +1341,9 @@ install-data-hook: ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc_eh.a ; \ ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc.a ; \ diff --git a/lang/g95/patches/patch-ac b/lang/g95/patches/patch-ac index 4f8611064ed..de5b7c6aa98 100644 --- a/lang/g95/patches/patch-ac +++ b/lang/g95/patches/patch-ac @@ -1,6 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2011/01/23 09:42:10 markd Exp $ +$NetBSD: patch-ac,v 1.2 2012/05/08 02:59:16 sbd Exp $ ---- configure.orig 2011-01-18 12:06:11.000000000 +0000 +Use $host_alias in the gcc-libdir path so it matches ${MACHINE_GNU_PLATFORM} + +--- configure.orig 2008-08-20 01:05:52.000000000 +0000 +++ configure @@ -4669,7 +4669,7 @@ target_version=0 @@ -11,3 +13,12 @@ $NetBSD: patch-ac,v 1.1 2011/01/23 09:42:10 markd Exp $ DEFAULT_INCLUDES=" " +@@ -4876,7 +4876,7 @@ _ACEOF + { echo "$as_me:$LINENO: result: $gcc_version" >&5 + echo "${ECHO_T}$gcc_version" >&6; } + +- DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version ++ DEST_LIBDIR=$prefix/lib/gcc-lib/$host_alias/$gcc_version + SAVE_DIR=`pwd` + PREFIX=$prefix + |