[94187] trunk/dports/devel/cctools

[jeremyhu at macports.org]

Revision: 94187
          https://trac.macports.org/changeset/94187
Author:   jeremyhu at macports.org
Date:     2012-06-11 14:27:22 -0700 (Mon, 11 Jun 2012)
Log Message:
-----------
cctools: Use version 806 for powerpc.

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

Removed Paths:
-------------
    trunk/dports/devel/cctools/files/PR-11136237-698.1.patch
    trunk/dports/devel/cctools/files/patch-misc_libtool.c.diff

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2012-06-11 21:04:44 UTC (rev 94186)
+++ trunk/dports/devel/cctools/Portfile	2012-06-11 21:27:22 UTC (rev 94187)
@@ -25,31 +25,21 @@
 
 patchfiles              PR-11136237.patch lto.patch cctools-822-no-lto.patch
 
-if {${os.arch} == "powerpc"} {
-    # XCode 3.1.4
-    version             698.1
-    revision            2
-    distname            cctools-${version}
-    checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
-                        sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-    supported_archs     i386 ppc
+variant universal {}
 
-    depends_build-delete port:ld64
-
-    patchfiles-delete   PR-11136237.patch cctools-822-no-lto.patch
-    patchfiles-append   patch-misc_libtool.c.diff PR-11136237-698.1.patch
-
-} elseif {${os.major} == 8} {
+if {${os.arch} == "powerpc" || ${os.major} < 9} {
     # XCode 4.1
     version             806
     revision            1
     distname            cctools-${version}
     checksums           rmd160  91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
                         sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
-    supported_archs     i386 x86_64
+    supported_archs     ppc i386 x86_64
 
     patchfiles-delete   cctools-822-no-lto.patch
     patchfiles-append   PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch
+} else {
+    supported_archs     i386 x86_64
 }
 
 if {![variant_isset llvm29] && ![variant_isset llvm30] && ![variant_isset llvm31] && ${os.major} >= 9} {

Deleted: trunk/dports/devel/cctools/files/PR-11136237-698.1.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-11136237-698.1.patch	2012-06-11 21:04:44 UTC (rev 94186)
+++ trunk/dports/devel/cctools/files/PR-11136237-698.1.patch	2012-06-11 21:27:22 UTC (rev 94187)
@@ -1,36 +0,0 @@
-diff -Naurp as/as.h as/as.h
---- as/as.h	2007-06-05 18:00:45.000000000 -0700
-+++ as/as.h	2012-04-03 10:27:49.000000000 -0700
-@@ -155,7 +155,7 @@ extern cpu_subtype_t archflag_cpusubtype
- extern char *specific_archflag;
- 
- /* TRUE if the .subsections_via_symbols directive was seen */
--int subsections_via_symbols;
-+extern int subsections_via_symbols;
- 
- /* -I path options for .includes */
- struct directory_stack {
-diff -Naurp otool/print_objc2_32bit.c otool/print_objc2_32bit.c
---- otool/print_objc2_32bit.c	2008-03-31 17:16:58.000000000 -0700
-+++ otool/print_objc2_32bit.c	2012-04-03 10:27:55.000000000 -0700
-@@ -229,7 +229,7 @@ struct category_t {
-     uint32_t protocols;		/* struct protocol_list_t * (32-bit pointer) */
-     uint32_t instanceProperties; /* struct objc_property_list *
- 				    (32-bit pointer) */
--} category_t;
-+};
- 
- static
- void
-diff -Naurp otool/print_objc2_64bit.c otool/print_objc2_64bit.c
---- otool/print_objc2_64bit.c	2008-03-31 17:17:01.000000000 -0700
-+++ otool/print_objc2_64bit.c	2012-04-03 10:27:55.000000000 -0700
-@@ -232,7 +232,7 @@ struct category_t {
-     uint64_t protocols;		/* struct protocol_list_t * (64-bit pointer) */
-     uint64_t instanceProperties; /* struct objc_property_list *
- 				    (64-bit pointer) */
--} category_t;
-+};
- 
- static
- void

Deleted: trunk/dports/devel/cctools/files/patch-misc_libtool.c.diff
===================================================================
--- trunk/dports/devel/cctools/files/patch-misc_libtool.c.diff	2012-06-11 21:04:44 UTC (rev 94186)
+++ trunk/dports/devel/cctools/files/patch-misc_libtool.c.diff	2012-06-11 21:27:22 UTC (rev 94187)
@@ -1,9 +0,0 @@
---- misc/libtool.c	2012-02-12 14:32:58.000000000 +0100
-+++ misc/libtool.c	2012-02-12 14:33:32.000000000 +0100
-@@ -55,6 +54,0 @@
--#include <mach/mach_init.h>
--#if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__)
--#include <servers/netname.h>
--#else
--#include <servers/bootstrap.h>
--#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120611/29c343e3/attachment.html>