[33662] trunk/dports/science/cdf

gwright at macports.org gwright at macports.org
Sat Feb 2 11:20:08 PST 2008


Revision: 33662
          http://trac.macosforge.org/projects/macports/changeset/33662
Author:   gwright at macports.org
Date:     2008-02-02 11:20:07 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
First try to fix build on Leopard.

Modified Paths:
--------------
    trunk/dports/science/cdf/Portfile
    trunk/dports/science/cdf/files/patch-Makefile

Modified: trunk/dports/science/cdf/Portfile
===================================================================
--- trunk/dports/science/cdf/Portfile	2008-02-02 19:18:40 UTC (rev 33661)
+++ trunk/dports/science/cdf/Portfile	2008-02-02 19:20:07 UTC (rev 33662)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+
 name		cdf
 version		32
 maintainers	gwright at macports.org
@@ -39,6 +40,14 @@
 
 patchfiles	patch-Makefile
 
+post-patch	{
+		  reinplace "s|-L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1|`gcc-mp-4.2 -print-libgcc-file-name`|g" Makefile
+		  reinplace "s|-L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64|`gcc-mp-4.2 -print-libgcc-file-name`|g" Makefile
+		  reinplace "s|-L/usr/lib/gcc/i686-apple-darwin8/4.0.1|`gcc-mp-4.2 -print-libgcc-file-name`|g" Makefile
+
+		  reinplace "s|/Developer/SDKs/MacOSX10.4u.sdk/usr/lib|${prefix}/lib|g" Makefile
+		}
+
 build		{
 		  system "make OS=macosx ENV=${cdf_arch} FORTRAN=yes FC=gfortran-mp-4.2 all"
 		}

Modified: trunk/dports/science/cdf/files/patch-Makefile
===================================================================
--- trunk/dports/science/cdf/files/patch-Makefile	2008-02-02 19:18:40 UTC (rev 33661)
+++ trunk/dports/science/cdf/files/patch-Makefile	2008-02-02 19:20:07 UTC (rev 33662)
@@ -1,6 +1,6 @@
---- Makefile.sav	2007-09-06 21:42:06.000000000 -0400
-+++ Makefile	2007-09-06 21:43:57.000000000 -0400
-@@ -166,39 +166,39 @@
+--- Makefile.sav	2008-02-02 13:16:04.000000000 -0500
++++ Makefile	2008-02-02 13:16:48.000000000 -0500
+@@ -171,43 +171,43 @@
  EXEEXT_macosx=
  
  CURSES_macosx_ppc=yes
@@ -13,12 +13,13 @@
 -COPTIONS_macosx_ppc=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
 +COPTIONS_macosx_ppc=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
  COPTIONSld_macosx_ppc=-arch ppc -isysroot/Developer/SDKs/MacOSX10.4u.sdk
--FOPTIONS_macosx_ppc=-w
-+FOPTIONS_macosx_ppc=-w -fsecond-underscore
+ FOPTIONS_macosx_ppc=-w
  FOPTIONSld_macosx_ppc=
  CURSESLIB_macosx_ppc=-lcurses
- SYSLIBSexe_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lgcc -lSystemStubs
- SYSLIBSshr_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lgcc -lSystemStubs
+-SYSLIBSexe_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lgcc -lSystemStubs
+-SYSLIBSshr_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lgcc -lSystemStubs
++SYSLIBSexe_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lSystemStubs
++SYSLIBSshr_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lSystemStubs
  
  CURSES_macosx_ppc64=yes
 -CC_macosx_ppc64=gcc
@@ -30,12 +31,13 @@
 -COPTIONS_macosx_ppc64=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch ppc64 -m64 -DMACOSX64 -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
 +COPTIONS_macosx_ppc64=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -m64 -DMACOSX64 -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
  COPTIONSld_macosx_ppc64=-arch ppc64 -isysroot/Developer/SDKs/MacOSX10.4u.sdk
--FOPTIONS_macosx_ppc64=-w
-+FOPTIONS_macosx_ppc64=-w -fsecond-underscore
+ FOPTIONS_macosx_ppc64=-w
  FOPTIONSld_macosx_ppc64=
  CURSESLIB_macosx_ppc64=-lcurses
- SYSLIBSexe_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -gcc
- SYSLIBSshr_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -gcc
+-SYSLIBSexe_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -gcc
+-SYSLIBSshr_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -gcc
++SYSLIBSexe_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc
++SYSLIBSshr_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc
  
  CURSES_macosx_i386=yes
 -CC_macosx_i386=gcc
@@ -46,10 +48,15 @@
  PIC_macosx_i386=
 -COPTIONS_macosx_i386=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
 -COPTIONSld_macosx_i386=-arch i386 -isysroot/Developer/SDKs/MacOSX10.4u.sdk
--FOPTIONS_macosx_i386=-w
 +COPTIONS_macosx_i386=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
 +COPTIONSld_macosx_i386=-isysroot/Developer/SDKs/MacOSX10.4u.sdk
-+FOPTIONS_macosx_i386=-w -fsecond-underscore
+ FOPTIONS_macosx_i386=-w
  FOPTIONSld_macosx_i386=
  CURSESLIB_macosx_i386=-lcurses
- SYSLIBSexe_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc -lgcc
+-SYSLIBSexe_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc -lgcc
+-SYSLIBSshr_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc -lgcc
++SYSLIBSexe_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc 
++SYSLIBSshr_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc
+ 
+ # CURSES_macosx_i386_64=yes
+ # CC_macosx_i386_64=/usr/bin/gcc -arch x86_64

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080202/1569252a/attachment.html


More information about the macports-changes mailing list