[91850] trunk/dports/devel

[jeremyhu at macports.org]

Revision: 91850
          https://trac.macports.org/changeset/91850
Author:   jeremyhu at macports.org
Date:     2012-04-11 16:33:28 -0700 (Wed, 11 Apr 2012)
Log Message:
-----------
cctools: Use cctools-795 on Tiger/intel

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

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2012-04-11 23:23:37 UTC (rev 91849)
+++ trunk/dports/devel/cctools/Portfile	2012-04-11 23:33:28 UTC (rev 91850)
@@ -27,7 +27,7 @@
 
 patchfiles              PR-11136237.patch
 
-if {${os.major} < 9 || ${os.arch} == "powerpc"} {
+if {${os.arch} == "powerpc"} {
     # XCode 3.1.4
     version             698.1
     revision            1
@@ -37,7 +37,7 @@
     patchfiles          patch-misc_libtool.c.diff PR-11136237-698.1.patch
 
     supported_archs     i386 ppc
-} elseif {${os.major} == 9} {
+} elseif {${os.major} <= 9} {
     # XCode 3.2.6
     version             795
     distname            cctools-${version}
@@ -57,6 +57,10 @@
 use_configure           no
 destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
 
+variant darwin 8 {
+    depends_build-remove path:lib/libprunetrie.a:ld64
+}
+
 post-patch {
     # We don't want to build cctools ld.  We want to use ld64
     reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
@@ -84,7 +88,6 @@
 
 pre-build {
     build.args-append \
-        TRIE=-DTRIE_SUPPORT \
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
         LTO=-DLTO_SUPPORT \
@@ -92,11 +95,18 @@
         CXX="${configure.cxx}" \
         RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
         LLVM_MC="llvm-mc-mp-${llvm_version}"
+
+    if {${os.major} == 8} {
+        build.args-append \
+            TRIE=
+    } else {
+        build.args-append \
+            TRIE=-DTRIE_SUPPORT
+    }
 }
 
 pre-destroot {
     destroot.args-append \
-        TRIE=-DTRIE_SUPPORT \
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
         LTO=-DLTO_SUPPORT \
@@ -104,6 +114,14 @@
         CXX="${configure.cxx}" \
         RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
         LLVM_MC="llvm-mc-mp-${llvm_version}"
+
+    if {${os.major} == 8} {
+        destroot.args-append \
+            TRIE=
+    } else {
+        destroot.args-append \
+            TRIE=-DTRIE_SUPPORT
+    }
 }
 
 platform macosx {

Modified: trunk/dports/devel/cctools-headers/Portfile
===================================================================
--- trunk/dports/devel/cctools-headers/Portfile	2012-04-11 23:23:37 UTC (rev 91849)
+++ trunk/dports/devel/cctools-headers/Portfile	2012-04-11 23:33:28 UTC (rev 91850)
@@ -19,12 +19,12 @@
 checksums               rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
                         sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
 
-if {${os.major} < 9 || ${os.arch} == "powerpc"} {
+if {${os.arch} == "powerpc"} {
     version             698.1
     distname            cctools-${version}
     checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
                         sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-} elseif {${os.major} == 9} {
+} elseif {${os.major} <= 9} {
     version             795
     distname            cctools-${version}
     checksums           rmd160  0932fa5a96b81e50528211abfec01a9b66790485 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120411/a6ed4fbe/attachment.html>