[91564] trunk/dports/devel

5 Apr 2012

Revision: 91564
          https://trac.macports.org/changeset/91564
Author:   jeremyhu@macports.org
Date:     2012-04-05 02:31:24 -0700 (Thu, 05 Apr 2012)
Log Message:
-----------
cctools{-headers,}, ld64, dyld-headers: Update Leopard/intel toolchain to match XCode 3.2.6

This updates the linker and cctools provided to Leopard/intel to match what
was provided by XCode 3.2.6, the last XCode release to support building for
Leopard or ppc.  The tools themselves only build for intel.  It should be
possible to update them to build for ppc, and I may come back to that later,
but for now, ppc users are stuck on the older XCode 3.1.6 toolchain.

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile
    trunk/dports/devel/cctools-headers/Portfile
    trunk/dports/devel/dyld-headers/Portfile
    trunk/dports/devel/ld64/Portfile

Modified: trunk/dports/devel/cctools/Portfile
===================================================================

--- trunk/dports/devel/cctools/Portfile	2012-04-05 08:48:29 UTC (rev 91563)
+++ trunk/dports/devel/cctools/Portfile	2012-04-05 09:31:24 UTC (rev 91564)
@@ -26,9 +26,7 @@
 
 patchfiles              PR-11136237.patch
 
-if {${os.major} < 10} {
-    # We should bump to at-least version 795, which was included in
-    # XCode 3.2.6 and supports Tiger and Leopard targets.
+if {${os.major} < 9 || ${os.arch} == "ppc"} {
     version             698.1
     revision            1
     distname            cctools-${version}
@@ -37,12 +35,19 @@
     patchfiles          patch-misc_libtool.c.diff PR-11136237-698.1.patch
 
     supported_archs     i386 ppc
+} elseif {${os.major} == 9} {
+    version             795
+    distname            cctools-${version}
+    checksums           rmd160  0932fa5a96b81e50528211abfec01a9b66790485 \
+                        sha256  7fab7044b648e92a9fefd493a1bb6daa4246f24c5838d8b5c913a446e6bbd2ef
+    supported_archs     i386 x86_64
 } elseif {${os.major} == 10} {
     version             809
     revision            1
     distname            cctools-${version}
     checksums           rmd160  f433124035ac0ef403bdc6edec087bdedd0b4375 \
                         sha256  03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
+    supported_archs     i386 x86_64
 }
 
 use_configure           no

Modified: trunk/dports/devel/cctools-headers/Portfile
===================================================================
--- trunk/dports/devel/cctools-headers/Portfile	2012-04-05 08:48:29 UTC (rev 91563)
+++ trunk/dports/devel/cctools-headers/Portfile	2012-04-05 09:31:24 UTC (rev 91564)
@@ -19,11 +19,16 @@
 checksums               rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
                         sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
 
-if {${os.major} < 10} {
+if {${os.major} < 9 || ${os.arch} == "ppc"} {
     version             698.1
     distname            cctools-${version}
     checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
                         sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
+} elseif {${os.major} == 9} {
+    version             795
+    distname            cctools-${version}
+    checksums           rmd160  0932fa5a96b81e50528211abfec01a9b66790485 \
+                        sha256  7fab7044b648e92a9fefd493a1bb6daa4246f24c5838d8b5c913a446e6bbd2ef
 } elseif {${os.major} == 10} {
     version             809
     distname            cctools-${version}

Modified: trunk/dports/devel/dyld-headers/Portfile
===================================================================
--- trunk/dports/devel/dyld-headers/Portfile	2012-04-05 08:48:29 UTC (rev 91563)
+++ trunk/dports/devel/dyld-headers/Portfile	2012-04-05 09:31:24 UTC (rev 91564)
@@ -8,7 +8,7 @@
 name                    dyld-headers
 version                 195.6
 categories              devel
-maintainers             mfeiri openmaintainer
+maintainers             mfeiri jeremyhu openmaintainer
 homepage                http://opensource.apple.com/source/dyld/
 master_sites            http://opensource.apple.com/tarballs/dyld/
 license                 APSL-2.0
@@ -20,6 +20,20 @@
 checksums               rmd160  440c49f641e45a7bce459aaea2c4fe0dd0385351 \
                         sha256  69296e9b4192bdac778ea899fffc18b02be62b51b5e8474b4cf85ae5f2b08aa4
 
+if {${os.major} < 9} {
+    # The main reason for using the older 97.1 on Tiger is because of the change for Availability.h
+    version             97.1
+    distname            dyld-${version}
+    checksums           rmd160  86f82f58d610e7beea4b035aa528d2fdea85dcb8 \
+                        sha256  917c88c6efb507511353e82ce9b453ac9c4da3156fafae4955ae11d2fcc4f181
+} elseif {${os.major} < 11} {
+    # We can probably use 195 headers or later on Leopard but I haven't verified yet.
+    version             132.13
+    distname            dyld-${version}
+    checksums           rmd160  15636fd3b237575a8301d0d1d659f4aa7e018012 \
+                        sha256  31d8767d4fcb2b9f861fe91cae97f411fe0df48b1bd5f5725d09311b5e62346e
+}
+
 xcode.target            libdyld
 xcode.configuration     Release
 
@@ -34,26 +48,5 @@
     file delete -force ${destroot}${applications_dir}
 }
 
-if {${os.major} < 9} {
-    pre-fetch {
-        ui_error "${name} requires Mac OS X 10.5 or later."
-        return -code error "incompatible Mac OS X version"
-    }
-}
-
-platform darwin 9 {
-    version             97.1
-    distname            dyld-${version}
-    checksums           rmd160  86f82f58d610e7beea4b035aa528d2fdea85dcb8 \
-                        sha256  917c88c6efb507511353e82ce9b453ac9c4da3156fafae4955ae11d2fcc4f181
-}
-
-platform darwin 10 {
-    version             132.13
-    distname            dyld-${version}
-    checksums           rmd160  15636fd3b237575a8301d0d1d659f4aa7e018012 \
-                        sha256  31d8767d4fcb2b9f861fe91cae97f411fe0df48b1bd5f5725d09311b5e62346e
-}
-
 livecheck.type          regex
 livecheck.regex         "dyld-(\[\\d.\]+)"

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2012-04-05 08:48:29 UTC (rev 91563)
+++ trunk/dports/devel/ld64/Portfile	2012-04-05 09:31:24 UTC (rev 91564)
@@ -37,7 +37,7 @@
     depends_build
 
     patchfiles          ld64-62.1-dylib_version_args.patch
-} elseif {${os.major} == 9} {
+} elseif {${os.arch} == "ppc"} {
     version             85.2.1
     revision            4
     checksums           rmd160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 \
@@ -45,11 +45,12 @@
     supported_archs     i386 ppc
     depends_build       port:llvm-${llvm_version}
     patchfiles          patch-MATH85-ld.cpp.diff
-} elseif {${os.major} == 10} {
+} elseif {${os.major} < 11} {
     version             127.2
     revision            4
     checksums           rmd160  8ee709341549a1944732daef6ebab7ef1acfcc6e \
                         sha256  97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
+    supported_archs     i386 x86_64
 }
 
 xcode.target            all ObjectDump machocheck
@@ -100,7 +101,7 @@
                 @executable_path/../lib/libLTO.dylib ${destroot}${prefix}/libexec/ld64/ld"
     }
 
-    if {${os.major} >= 10} {
+    if {[file exists ${destroot}${prefix}/bin/libprunetrie.a]} {
         file rename ${destroot}${prefix}/bin/libprunetrie.a ${destroot}${prefix}/lib/libprunetrie.a
     }
 }

    

[91564] trunk/dports/devel

jeremyhu＠macports.org