[86193] trunk/dports/graphics/wxWidgets-devel/Portfile

[ryandesign at macports.org]

Revision: 86193
          http://trac.macports.org/changeset/86193
Author:   ryandesign at macports.org
Date:     2011-10-20 20:07:14 -0700 (Thu, 20 Oct 2011)
Log Message:
-----------
wxWidgets-devel: fix universal build on non-Lion; simplify getting canonical archflags

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-devel/Portfile

Modified: trunk/dports/graphics/wxWidgets-devel/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/Portfile	2011-10-20 23:18:16 UTC (rev 86192)
+++ trunk/dports/graphics/wxWidgets-devel/Portfile	2011-10-21 03:07:14 UTC (rev 86193)
@@ -74,37 +74,28 @@
 
 build.target
 
-universal_variant   yes
 use_parallel_build  yes
 
+variant universal {
+    configure.args-append   --enable-universal_binary \
+        --with-macosx-sdk=${configure.sdkroot}/ \
+        --with-macosx-version-min=${macosx_deployment_target}
+}
 
 configure.ccache    no
 
-if {![variant_isset universal]} {
-    set mp_arch_flags   "-arch ${configure.build_arch}"
-} else {
-    set mp_arch_flags   "-arch [join ${universal_archs} \ -arch\ ]"
-}
-   
-configure.cppflags-append "${mp_arch_flags}"
-
 post-destroot {
     set confscript ${prefix}/lib/wx/config/osx_cocoa-unicode-2.9
     ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
 }
 
 platform darwin 11 {
-     configure.args-append \
-     --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk \
-     --with-macosx-version-min=10.6
+    # Is this necessary?
+    macosx_deployment_target 10.6
 }
 
-variant universal {
-        configure.args-append   --enable-universal_binary
-}
-
 post-patch {
-        reinplace "s|@@MP_ARCH_FLAGS@@|${mp_arch_flags}|" ${worksrcpath}/../configure
+    reinplace "s|@@MP_ARCH_FLAGS@@|[get_canonical_archflags]|g" ${worksrcpath}/../configure
 }
 
 default_variants    +sdl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111020/d71a2fbb/attachment.html>