[92240] trunk/dports/devel/cctools/Portfile

[jeremyhu at macports.org]

Revision: 92240
          https://trac.macports.org/changeset/92240
Author:   jeremyhu at macports.org
Date:     2012-04-22 03:20:58 -0700 (Sun, 22 Apr 2012)
Log Message:
-----------
cctools: Additionally disable -DTRIE_SUPPORT on Leopard/ppc since it also uses the same older ld64

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

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2012-04-22 10:09:39 UTC (rev 92239)
+++ trunk/dports/devel/cctools/Portfile	2012-04-22 10:20:58 UTC (rev 92240)
@@ -32,11 +32,13 @@
     distname            cctools-${version}
     checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
                         sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
+    supported_archs     i386 ppc
 
+    depends_build-delete path:lib/libprunetrie.a:ld64
+
     patchfiles-delete   PR-11136237.patch
     patchfiles-append   patch-misc_libtool.c.diff PR-11136237-698.1.patch
 
-    supported_archs     i386 ppc
 } elseif {${os.major} == 8} {
     # XCode 4.1
     version             806
@@ -46,6 +48,8 @@
                         sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
     supported_archs     i386 x86_64
 
+    depends_build-delete path:lib/libprunetrie.a:ld64
+
     patchfiles-append   PR-9087924.patch PR-9830754.patch
 }
 
@@ -72,10 +76,6 @@
 use_configure           no
 destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
 
-platform darwin 8 {
-    depends_build-delete 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
@@ -116,12 +116,12 @@
         LLVM_MC="llvm-mc-mp-${llvm_version}" \
         SDK="-I${prefix}/include"
 
-    if {${os.major} == 8} {
+    if {[file exists ${prefix}/lib/libprunetrie.a]} {
         build.args-append \
-            TRIE=
+            TRIE=-DTRIE_SUPPORT
     } else {
         build.args-append \
-            TRIE=-DTRIE_SUPPORT
+            TRIE=
     }
 }
 
@@ -138,12 +138,12 @@
         LLVM_MC="llvm-mc-mp-${llvm_version}" \
         SDK="-I${prefix}/include"
 
-    if {${os.major} == 8} {
+    if {[file exists ${prefix}/lib/libprunetrie.a]} {
         destroot.args-append \
-            TRIE=
+            TRIE=-DTRIE_SUPPORT
     } else {
         destroot.args-append \
-            TRIE=-DTRIE_SUPPORT
+            TRIE=
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120422/6cb1f122/attachment.html>