[60475] trunk/dports/lang/g95

[takeshi at macports.org]

Revision: 60475
          http://trac.macports.org/changeset/60475
Author:   takeshi at macports.org
Date:     2009-11-13 00:13:31 -0800 (Fri, 13 Nov 2009)
Log Message:
-----------
g95: fixed gcc42 variants for ppc and ppc64.

Modified Paths:
--------------
    trunk/dports/lang/g95/Portfile
    trunk/dports/lang/g95/files/patch-Makefile.in.diff

Modified: trunk/dports/lang/g95/Portfile
===================================================================
--- trunk/dports/lang/g95/Portfile	2009-11-13 07:54:00 UTC (rev 60474)
+++ trunk/dports/lang/g95/Portfile	2009-11-13 08:13:31 UTC (rev 60475)
@@ -105,7 +105,7 @@
 
 post-build {
     system "cd ${worksrcpath}/libf95.a-${version}; \
-           export CFLAGS=${configure.cflags}; \
+           export CFLAGS=\"${configure.cflags} ${configure.cc_archflags}\"; \
            ./configure --prefix=${prefix} ${buildhost}; \
            make"
 }
@@ -146,6 +146,8 @@
     }
 
     pre-build {
-        reinplace "s|\(g95_LDADD\)|(g95_LDADD) ${workpath}/gcc-${version_gcc}/g95/gcc/driver-i386.o|" ${worksrcpath}/Makefile
+        if {${os.arch}=="i386"} {
+            reinplace "s|\(g95_LDADD\)|(g95_LDADD) ${workpath}/gcc-${version_gcc}/g95/gcc/driver-i386.o|" ${worksrcpath}/Makefile
+        }
     }
 }

Modified: trunk/dports/lang/g95/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/lang/g95/files/patch-Makefile.in.diff	2009-11-13 07:54:00 UTC (rev 60474)
+++ trunk/dports/lang/g95/files/patch-Makefile.in.diff	2009-11-13 08:13:31 UTC (rev 60475)
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2009-11-05 16:53:58.000000000 +0900
-+++ Makefile.in	2009-11-05 16:55:16.000000000 +0900
+--- Makefile.in.orig	2009-11-12 09:16:03.000000000 +0900
++++ Makefile.in	2009-11-12 09:17:17.000000000 +0900
 @@ -272,7 +272,9 @@
  @GCC_TRUE at f951_LDADD = @GCC_DIR@/g95/gcc/main.o @GCC_DIR@/g95/gcc/libbackend.a	\
  @GCC_TRUE@             @GCC_DIR@/g95/libcpp/libcpp.a				\
@@ -19,7 +19,7 @@
  
  install-html: install-html-am
  
-@@ -1332,27 +1333,22 @@
+@@ -1332,32 +1333,27 @@
  	mv $(bindir)/g95$(EXEEXT) $(bindir)/$(host)-g95$(EXEEXT)
  
  install-data-hook:
@@ -53,3 +53,10 @@
  	fi
  
  ggc-page.o: ggc-page40.c ggc-page41.c
+- at GCC41_TRUE@	$(CC) -c -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC ggc-page41.c
+- at GCC41_FALSE@	$(CC) -c -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC ggc-page40.c
++ at GCC41_TRUE@	$(CC) -c $(CFLAGS) -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC ggc-page41.c
++ at GCC41_FALSE@	$(CC) -c $(CFLAGS) -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC ggc-page40.c
+ 
+ options.h options.o: lang.opt
+ 	$(AWK) -f @GCC_DIR@/gcc/opt-functions.awk \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091113/fca08d3e/attachment.html>