Changeset 81222

Timestamp:

07/26/11 23:11:58 (4 years ago)

Author:

ryandesign@…

Message:

arb: fix build for Lion / clang; see #30342

Location:

trunk/dports/science/arb

Files:

• Portfile (modified) (4 diffs)
• files/patch-ARB-Flatio.diff (added)
• files/patch-ARB-Zuk_to_gen.c.diff (added)
• files/patch-ARB-count.c.diff (added)
• files/patch-ARB-interface.c.diff (added)
• files/patch-ARB-lsadt.c.diff (added)
• files/patch-ARB-makefile.diff (modified) (5 diffs)

trunk/dports/science/arb/Portfile

@@ -7 +7 @@
 epoch                   1
 version                 5.2
-revision                1
+revision                2
 categories              science
 maintainers             me.com:matt.cottrell 
@@ -55 +55 @@
                         patch-ARB-DARWIN.pl.diff \
                         patch-ARB-glpng.diff \
-                        arb_intro.fig.diff
+                        arb_intro.fig.diff \
+                        patch-ARB-Flatio.diff \
+                        patch-ARB-Zuk_to_gen.c.diff \
+                        patch-ARB-count.c.diff \
+                        patch-ARB-lsadt.c.diff \
+                        patch-ARB-interface.c.diff
                        
 configure               {
@@ -77 +82 @@
                         reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/bin/arb_macsetup
 
-                        reinplace "s|OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk|OSX_SDK:=${configure.sdkroot}|g" ${worksrcpath}/Makefile
-
                         if {${build_arch} == "ppc" || ${build_arch} == "i386"} {
                             set is64bit 0
@@ -90 +93 @@
                         ARBHOME=${worksrcpath} \
                         PATH=${worksrcpath}/bin:$env(PATH)
+
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+    configure.compiler clang
+}
 
 build.args              GCC=${configure.cc} \

trunk/dports/science/arb/files/patch-ARB-makefile.diff

@@ -1 @@
-Index: Makefile
-===================================================================
---- Makefile    (revision 6215)
-+++ Makefile    (working copy)
-@@ -31,11 +31,12 @@
+--- Makefile.orig       2010-09-05 12:00:58.000000000 -0400
++++ Makefile    2011-07-26 00:35:21.000000000 -0400
+@@ -31,22 +31,21 @@
  #                       configurable in config.makefile
  #
@@ -17 +15 @@
  
  FORCEMASK = umask 002
-@@ -198,15 +197,15 @@
+ 
+ # ---------------------- [unconditionally used options]
+ 
+-GCC:=gcc
+-GPP:=g++ 
+-CPPreal:=cpp
+-
+-
++#GCC:=gcc      <Now set in the Portfile>
++#GPP:=g++      <Now set in the Portfile>
++#CPPreal:=cpp  <Now set in the Portfile>
+ 
+ # ---------------------- compiler version detection
+ 
+@@ -71,7 +70,7 @@
+ #---------------------- define special directories for non standard builds
+ 
+ ifdef DARWIN
+-OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk
++OSX_SDK:=
+ OSX_FW:=/System/Library/Frameworks
+ OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
+ OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
+@@ -186,7 +185,6 @@
+ dflags += -D$(MACH) # define machine
+ 
+ ifdef DARWIN
+-       cflags += -no-cpp-precomp 
+        shared_cflags += -fno-common
+ else
+        dflags +=  $(shell getconf LFS_CFLAGS)
+@@ -199,15 +197,15 @@
  
  #---------------------- X11 location
@@ -36 +65 @@
  else
         XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11
-@@ -225,14 +224,9 @@
+@@ -226,14 +224,9 @@
  
  GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng
@@ -54 +83 @@
  
  #XLIBS += $(GL_LIB)
-@@ -247,11 +241,7 @@
+@@ -248,11 +241,7 @@
  
  #---------------------- tiff lib:
@@ -67 +96 @@
  #---------------------- basic libs:
  
-@@ -317,11 +307,7 @@
+@@ -318,11 +307,7 @@
  # other used tools