[70156] trunk/dports

[ryandesign at macports.org]

Revision: 70156
          http://trac.macports.org/changeset/70156
Author:   ryandesign at macports.org
Date:     2010-07-30 14:30:26 -0700 (Fri, 30 Jul 2010)
Log Message:
-----------
muniversal: fix inability to find nm when cross-compiling (#22224, #23431, #23687, #24477)

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
    trunk/dports/devel/dbus/Portfile
    trunk/dports/devel/gmp/Portfile
    trunk/dports/devel/libssh2/Portfile
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-07-30 20:00:52 UTC (rev 70155)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-07-30 21:30:26 UTC (rev 70156)
@@ -164,6 +164,9 @@
     }
 
     configure {
+        # Fix inability to find nm when cross-compiling (#22224, #23431, #23687, #24477, et al)
+        configure.env-append    NM=/usr/bin/nm
+
         foreach arch ${universal_archs_to_use} {
             ui_info "$UI_PREFIX [format [msgcat::mc "Configuring %1\$s for architecture %2\$s"] $name ${arch}]"
 

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2010-07-30 20:00:52 UTC (rev 70155)
+++ trunk/dports/devel/dbus/Portfile	2010-07-30 21:30:26 UTC (rev 70156)
@@ -202,12 +202,10 @@
     }
 }
 
-set cross_opts  "ac_cv_have_abstract_sockets=no NM='/usr/bin/nm -p'"
+set cross_opts  "ac_cv_have_abstract_sockets=no"
 if { ${os.arch}=="i386" } {
     if { ${os.major} >= 10 } {
         set merger_configure_env(ppc) ${cross_opts}
-    } else {
-        set merger_configure_env(ppc) "NM='/usr/bin/nm -p'"
     }
     set merger_configure_env(ppc64)   ${cross_opts}
 } else {

Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile	2010-07-30 20:00:52 UTC (rev 70155)
+++ trunk/dports/devel/gmp/Portfile	2010-07-30 21:30:26 UTC (rev 70156)
@@ -82,14 +82,6 @@
         x86_64  ABI=64
     }
 
-    if { ${os.arch}=="i386" } {
-        set merger_configure_env(ppc)     "NM='/usr/bin/nm -p'"
-        set merger_configure_env(ppc64)   "NM='/usr/bin/nm -p'"
-    } else {
-        set merger_configure_env(i386)    "NM='/usr/bin/nm -p'"
-        set merger_configure_env(x86_64)  "NM='/usr/bin/nm -p'"
-    }
-
     # universal_archs_to_use might not be set before pre-fetch.
     pre-destroot {
         global merger_dont_diff merger_configure_env

Modified: trunk/dports/devel/libssh2/Portfile
===================================================================
--- trunk/dports/devel/libssh2/Portfile	2010-07-30 20:00:52 UTC (rev 70155)
+++ trunk/dports/devel/libssh2/Portfile	2010-07-30 21:30:26 UTC (rev 70156)
@@ -32,8 +32,6 @@
     lib/libcrypto.dylib \
     lib/libz.dylib
 
-configure.env-append	NM="/usr/bin/nm -p"
-
 post-build {
     if {[variant_isset universal]} {
         foreach arch ${universal_archs_to_use} {

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2010-07-30 20:00:52 UTC (rev 70155)
+++ trunk/dports/x11/pango/Portfile	2010-07-30 21:30:26 UTC (rev 70156)
@@ -102,13 +102,6 @@
     }
 }
 
-if { ${os.arch}=="i386" } {
-    set merger_configure_env(ppc)     "NM='/usr/bin/nm -p'"
-    set merger_configure_env(ppc64)   "NM='/usr/bin/nm -p'"
-} else {
-    set merger_configure_env(i386)    "NM='/usr/bin/nm -p'"
-    set merger_configure_env(x86_64)  "NM='/usr/bin/nm -p'"
-}
 lappend merger_configure_args(ppc64)   have_atsui=false
 lappend merger_configure_args(x86_64)  have_atsui=false
 

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2010-07-30 20:00:52 UTC (rev 70155)
+++ trunk/dports/x11/pango-devel/Portfile	2010-07-30 21:30:26 UTC (rev 70156)
@@ -112,13 +112,6 @@
     }
 }
 
-if { ${os.arch}=="i386" } {
-    set merger_configure_env(ppc)     "NM='/usr/bin/nm -p'"
-    set merger_configure_env(ppc64)   "NM='/usr/bin/nm -p'"
-} else {
-    set merger_configure_env(i386)    "NM='/usr/bin/nm -p'"
-    set merger_configure_env(x86_64)  "NM='/usr/bin/nm -p'"
-}
 lappend merger_configure_env(ppc64)   ac_cv_header_Carbon_Carbon_h=no
 lappend merger_configure_env(x86_64)  ac_cv_header_Carbon_Carbon_h=no
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100730/bcfe11e4/attachment.html>