[51917] trunk/dports/lang

[toby at macports.org]

Revision: 51917
          http://trac.macports.org/changeset/51917
Author:   toby at macports.org
Date:     2009-06-06 02:54:24 -0700 (Sat, 06 Jun 2009)
Log Message:
-----------
Protect python ports from universal_sysroot removal. This is a rather unfortunate fix, as it would appear that python insists on using an SDK even though it's wholly unnecessary (except on Tiger/PPC).

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python25/Portfile
    trunk/dports/lang/python26/Portfile
    trunk/dports/lang/python30/Portfile
    trunk/dports/lang/python31/Portfile

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2009-06-06 09:54:03 UTC (rev 51916)
+++ trunk/dports/lang/python24/Portfile	2009-06-06 09:54:24 UTC (rev 51917)
@@ -158,7 +158,15 @@
 }
 
 variant universal {
-    configure.args-append           --enable-universalsdk=${universal_sysroot}
+   if {[info exists universal_sysroot]} {
+      configure.args-append   --enable-universalsdk=${universal_sysroot}
+   } else {
+      if {${macosx_version} == "10.4"} {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}u.sdk
+      } else {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}.sdk
+      }
+   }
 }
 
 livecheck.check         regex

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2009-06-06 09:54:03 UTC (rev 51916)
+++ trunk/dports/lang/python25/Portfile	2009-06-06 09:54:24 UTC (rev 51917)
@@ -173,7 +173,15 @@
 }
 
 variant universal {
-   configure.args-append           --enable-universalsdk=${universal_sysroot}
+   if {[info exists universal_sysroot]} {
+      configure.args-append   --enable-universalsdk=${universal_sysroot}
+   } else {
+      if {${macosx_version} == "10.4"} {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}u.sdk
+      } else {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}.sdk
+      }
+   }
 }
 
 livecheck.check         regex

Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile	2009-06-06 09:54:03 UTC (rev 51916)
+++ trunk/dports/lang/python26/Portfile	2009-06-06 09:54:24 UTC (rev 51917)
@@ -150,7 +150,15 @@
          "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
          ${worksrcpath}/configure
    }
-   configure.args-append   --enable-universalsdk=${universal_sysroot}
+   if {[info exists universal_sysroot]} {
+      configure.args-append   --enable-universalsdk=${universal_sysroot}
+   } else {
+      if {${macosx_version} == "10.4"} {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}u.sdk
+      } else {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}.sdk
+      }
+   }
 }
 
 variant ucs4 description {Enable support for UCS4} {

Modified: trunk/dports/lang/python30/Portfile
===================================================================
--- trunk/dports/lang/python30/Portfile	2009-06-06 09:54:03 UTC (rev 51916)
+++ trunk/dports/lang/python30/Portfile	2009-06-06 09:54:24 UTC (rev 51917)
@@ -136,7 +136,15 @@
             ${worksrcpath}/configure
       }
    }
-   configure.args-append   --enable-universalsdk=${universal_sysroot}
+   if {[info exists universal_sysroot]} {
+      configure.args-append   --enable-universalsdk=${universal_sysroot}
+   } else {
+      if {${macosx_version} == "10.4"} {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}u.sdk
+      } else {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}.sdk
+      }
+   }
 }
 
 variant ucs4 description {Use 4-byte Unicode characters} {

Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile	2009-06-06 09:54:03 UTC (rev 51916)
+++ trunk/dports/lang/python31/Portfile	2009-06-06 09:54:24 UTC (rev 51917)
@@ -136,7 +136,15 @@
             ${worksrcpath}/configure
       }
    }
-   configure.args-append   --enable-universalsdk=${universal_sysroot}
+   if {[info exists universal_sysroot]} {
+      configure.args-append   --enable-universalsdk=${universal_sysroot}
+   } else {
+      if {${macosx_version} == "10.4"} {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}u.sdk
+      } else {
+         configure.args-append   --enable-universalsdk=/Developer/SDKs/MacOSX${macosx_version}.sdk
+      }
+   }
 }
 
 variant ucs4 description {Use 4-byte Unicode characters} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090606/f55ffff5/attachment.html>