[62529] trunk/dports/x11/mesa/Portfile

jmr at macports.org jmr at macports.org
Sat Jan 9 15:54:33 PST 2010


Revision: 62529
          http://trac.macports.org/changeset/62529
Author:   jmr at macports.org
Date:     2010-01-09 15:54:30 -0800 (Sat, 09 Jan 2010)
Log Message:
-----------
mesa: update universal/archflags logic

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2010-01-09 23:27:19 UTC (rev 62528)
+++ trunk/dports/x11/mesa/Portfile	2010-01-09 23:54:30 UTC (rev 62529)
@@ -68,18 +68,22 @@
     CC=${configure.cc} \
     CXX=${configure.cxx}
 
-variant universal {}
 if {[variant_isset universal]} {
     set extra_cflags ${configure.universal_cflags}
     set extra_ldflags ${configure.universal_ldflags}
 } else {
     set extra_cflags ${configure.cc_archflags}
-    set extra_ldflags ${configure.cc_archflags}
+    if {![info exists configure.ld_archflags]} {
+        eval configure.ldflags-append ${configure.cc_archflags}
+        set extra_ldflags ${configure.cc_archflags}
+    } else {
+        set extra_ldflags ${configure.ld_archflags}
+    }
 }
 
-build.args-append RC_CFLAGS="${extra_cflags}"
-eval configure.cflags-append ${extra_cflags}
-eval configure.ldflags-append ${extra_ldflags}
+if {$extra_cflags != ""} {
+    build.args-append RC_CFLAGS="${extra_cflags}"
+}
 
 if { ![file exists /usr/include/Xplugin.h] } {
         # Xplugin.h is missing on Tiger
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100109/c8f6512d/attachment.html>


More information about the macports-changes mailing list