Changeset 79850

Timestamp:

06/27/11 20:58:49 (4 years ago)

Author:

ryandesign@…

Message:

freeimage: actually use the right archs; see #29950

File:

• trunk/dports/graphics/freeimage/Portfile (modified) (4 diffs)

trunk/dports/graphics/freeimage/Portfile

@@ -6 +6 @@
 name                freeimage
 version             3.15.0
+revision            1
 license             FreeImage-1.0 GPL-2
 categories          graphics
@@ -28 +29 @@
                     rmd160  5d309d0d8335129d00d6b5455613c89a419ebcac
 
+set VERLIBNAME libfreeimage.[lindex [split ${version} .] 0].dylib
+
 post-patch {
     # Libraries extension is ".dylib" on Darwin, not ".so"
@@ -48 +51 @@
 }
 
-if { [variant_isset universal] } {
-    post-patch {
-        reinplace "s|CFLAGS ?= |CFLAGS ?= ${configure.universal_cflags} |g" ${worksrcpath}/Makefile.gnu
-        reinplace "s|CXXFLAGS ?= |CXXFLAGS ?= ${configure.universal_cxxflags} |g" ${worksrcpath}/Makefile.gnu
-    }
-} else {
-    post-patch {
-        reinplace "s|CFLAGS ?= |CFLAGS ?= -arch ${build_arch} |g" ${worksrcpath}/Makefile.gnu
-        reinplace "s|CXXFLAGS ?= |CXXFLAGS ?= -arch ${build_arch} |g" ${worksrcpath}/Makefile.gnu
-    }
-}
-
 use_configure       no
 
-set VERLIBNAME libfreeimage.[lindex [split ${version} .] 0].dylib
+variant universal {}
+if {[variant_isset universal]} {
+    set archflags ${configure.universal_cflags}
+} else {
+    set archflags ${configure.cc_archflags}
+}
 
 build.args          -f Makefile.gnu \
                     PREFIX=${prefix} \
                     VERLIBNAME=${VERLIBNAME} \
-                    CC="${configure.cc}" \
-                    CXX="${configure.cxx}" \
+                    CC="${configure.cc} ${configure.cflags} ${archflags}" \
+                    CXX="${configure.cxx} ${configure.cxxflags} ${archflags}" \
                     LDFLAGS="${configure.ldflags}"
 
@@ -92 +88 @@
 pre-test {
     # Use correct compiler and flags when compiling test
-    reinplace s:g++:${configure.cxx}: ${test.dir}/Makefile
+    reinplace "s:g++:${configure.cxx} ${configure.cxxflags} ${archflags}:" ${test.dir}/Makefile
 
     # Build the test