[91379] trunk/dports/graphics/freeimage/Portfile

[ryandesign at macports.org]

Revision: 91379
          https://trac.macports.org/changeset/91379
Author:   ryandesign at macports.org
Date:     2012-03-30 20:06:37 -0700 (Fri, 30 Mar 2012)
Log Message:
-----------
freeimage: use get_canonical_archflags

Modified Paths:
--------------
    trunk/dports/graphics/freeimage/Portfile

Modified: trunk/dports/graphics/freeimage/Portfile
===================================================================
--- trunk/dports/graphics/freeimage/Portfile	2012-03-31 02:14:56 UTC (rev 91378)
+++ trunk/dports/graphics/freeimage/Portfile	2012-03-31 03:06:37 UTC (rev 91379)
@@ -59,17 +59,12 @@
 use_configure       no
 
 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} ${configure.cflags} ${archflags}" \
-                    CXX="${configure.cxx} ${configure.cxxflags} ${archflags}" \
+                    CC="${configure.cc} ${configure.cflags} [get_canonical_archflags]" \
+                    CXX="${configure.cxx} ${configure.cxxflags} [get_canonical_archflags]" \
                     LDFLAGS="${configure.ldflags}"
 
 post-build {
@@ -77,8 +72,8 @@
     system -W ${worksrcpath} "${build.cmd} -f Makefile.fip \
         PREFIX=${prefix} \
         VERLIBNAME=${VERLIBNAME} \
-        CC='${configure.cc} ${configure.cflags} ${archflags}' \
-        CXX='${configure.cxx} ${configure.cxxflags} ${archflags}' \
+        CC='${configure.cc} ${configure.cflags} [get_canonical_archflags cc]' \
+        CXX='${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]' \
         LDFLAGS='${configure.ldflags}'"
 }
 
@@ -92,8 +87,8 @@
     # install FreeImagePlus
     system -W ${worksrcpath} "${destroot.cmd} -f Makefile.fip install \
         VERLIBNAME=${VERLIBNAME} \
-        CC='${configure.cc} ${configure.cflags} ${archflags}' \
-        CXX='${configure.cxx} ${configure.cxxflags} ${archflags}' \
+        CC='${configure.cc} ${configure.cflags} [get_canonical_archflags cc]' \
+        CXX='${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]' \
         LDFLAGS='${configure.ldflags}' \
         INCDIR='${destroot}${prefix}/include' \
         INSTALLDIR='${destroot}${prefix}/lib'"
@@ -112,7 +107,7 @@
 
 pre-test {
     # Use correct compiler and flags when compiling test
-    reinplace "s:g++:${configure.cxx} ${configure.cxxflags} ${archflags}:" ${test.dir}/Makefile
+    reinplace "s:g++:${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]:" ${test.dir}/Makefile
 
     # Build the test
     system "make -C ${test.dir}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120330/e102799b/attachment.html>