[57910] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[jmr at macports.org]

Revision: 57910
          http://trac.macports.org/changeset/57910
Author:   jmr at macports.org
Date:     2009-09-18 10:34:23 -0700 (Fri, 18 Sep 2009)
Log Message:
-----------
muniversal: remove 1.7 compat hacks

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-09-18 17:06:57 UTC (rev 57909)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-09-18 17:34:23 UTC (rev 57910)
@@ -101,16 +101,7 @@
         configure.universal_cflags-delete    -arch ${arch}
         configure.universal_cxxflags-delete  -arch ${arch}
         configure.universal_ldflags-delete   -arch ${arch}
-        configure.cflags-delete    -arch ${arch}
-        configure.cxxflags-delete  -arch ${arch}
-        configure.ldflags-delete   -arch ${arch}
     }
-    # workaround for #17865 (deleting all option contents also deletes the option)
-    foreach flags {universal_cflags universal_cxxflags universal_ldflags cflags cxxflags ldflags} {
-        if {![info exists configure.${flags}]} {
-            configure.${flags}
-        }
-    }
 
     eval configure.args-append      ${configure.universal_args}
     eval configure.cflags-append    ${configure.universal_cflags}
@@ -119,19 +110,6 @@
     eval configure.ldflags-append   ${configure.universal_ldflags}
     eval configure.cppflags-append  ${configure.universal_cppflags}
 
-    # undo setting of --host and --target from portconfigure.tcl procedure configure_get_universal_args
-    # XXX Quick hack for base after r49087
-    if {[llength [info commands "portconfigure::*"]] > 0} {
-        # XXX even more hackery, since portconfigure::configure_get_universal_system_name is gone on trunk
-        set undo_system_value ""
-    } else {
-        set undo_system_value [configure_get_universal_system_name]
-    }
-    if {[llength ${configure.universal_archs}] == 1 &&
-        [info exists undo_system_value] && $undo_system_value != ""} {
-        configure.args-delete --host=${undo_system_value} --target=${undo_system_value}
-    }
-
     # user has specified that build platform must be able to run binaries for supported architectures
     if { ${merger_must_run_binaries}=="yes" } {
         if { ${os.arch}=="i386" } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090918/2003699f/attachment.html>