Ticket #35494: cctools-829.patch

cctools/Portfile

@@ -2 +2 @@
 
 PortSystem              1.0
 name                    cctools
-# XCode 4.3
-version                 822
-revision                2
+# XCode 4.4
+version                 829
 categories              devel
 platforms               darwin
 maintainers             mfeiri jeremyhu openmaintainer
@@ -17 +16 @@
 homepage                http://opensource.apple.com/source/${name}/
 master_sites            http://opensource.apple.com/tarballs/${name}/
 
-checksums               rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
-                        sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
+checksums               sha1    859408aa1169a9c6b1ecd921d476c5b0df9f5717 \
+                        rmd160  55a01500935bf8a6e541ac2109317746c4e7b90d \
+                        sha256  f140b3a2ab7c85b0316afcd816cc8171f81585eea125bca64d781d4e192d65dc
 
 depends_lib             port:cctools-headers
 depends_build           port:ld64
 
-patchfiles              PR-11136237.patch lto.patch cctools-822-no-lto.patch
+patchfiles              cctools-829-lto.patch 
 
 variant universal {}
 
@@ -36 +36 @@
                         sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
     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
+    patchfiles-delete   cctools-829-lto.patch cctools-822-no-lto.patch
+    patchfiles-append   PR-9087924.patch PR-9830754.patch PR-11136237.patch cctools-806-lto.patch cctools-822-no-lto.patch
 } else {
     supported_archs     i386 x86_64
 }

cctools/files/cctools-806-lto.patch

@@ +1 @@
+--- libstuff/lto.c.orig 2012-04-20 22:44:19.000000000 -0700
++++ libstuff/lto.c      2012-04-20 22:51:04.000000000 -0700
+@@ -119,11 +119,19 @@ void **pmod) /* maybe NULL */
+            lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
+ 
+            lto_handle = dlopen(lto_path, RTLD_NOW);
++           free(lto_path);
+            if(lto_handle == NULL){
+-               free(lto_path);
+-               lto_path = NULL;
+-               lto_handle = dlopen("/Developer/usr/lib/libLTO.dylib",
+-                                   RTLD_NOW);
++               const char *lto_paths[] = {
++                   "@@LLVM_LIBDIR@@/libLTO.dylib",
++                   "/Developer/usr/lib/libLTO.dylib",
++                   "/usr/lib/libLTO.dylib",
++                   "/Applications/Xcode.app/usr/lib/libLTO.dylib",
++                   NULL
++                };
++                const char **p;
++               for(p = lto_paths; *p && !lto_handle ; p++) {
++                   lto_handle = dlopen(*p, RTLD_NOW);
++               }
+            }
+            if(lto_handle == NULL)
+                return(0);
+@@ -147,8 +154,6 @@ void **pmod) /* maybe NULL */
+               lto_get_sym_attr == NULL ||
+               lto_get_sym_name == NULL){
+                dlclose(lto_handle);
+-               if(lto_path != NULL)
+-                   free(lto_path);
+                return(0);
+            }
+        }

cctools/files/lto.patch

@@ -1 @@
---- libstuff/lto.c.orig 2012-04-20 22:44:19.000000000 -0700
-+++ libstuff/lto.c      2012-04-20 22:51:04.000000000 -0700
-@@ -119,11 +119,19 @@ void **pmod) /* maybe NULL */
-            lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
- 
-            lto_handle = dlopen(lto_path, RTLD_NOW);
-+           free(lto_path);
-            if(lto_handle == NULL){
--               free(lto_path);
--               lto_path = NULL;
--               lto_handle = dlopen("/Developer/usr/lib/libLTO.dylib",
--                                   RTLD_NOW);
-+               const char *lto_paths[] = {
-+                   "@@LLVM_LIBDIR@@/libLTO.dylib",
-+                   "/Developer/usr/lib/libLTO.dylib",
-+                   "/usr/lib/libLTO.dylib",
-+                   "/Applications/Xcode.app/usr/lib/libLTO.dylib",
-+                   NULL
-+                };
-+                const char **p;
-+               for(p = lto_paths; *p && !lto_handle ; p++) {
-+                   lto_handle = dlopen(*p, RTLD_NOW);
-+               }
-            }
-            if(lto_handle == NULL)
-                return(0);
-@@ -147,8 +154,6 @@ void **pmod) /* maybe NULL */
-               lto_get_sym_attr == NULL ||
-               lto_get_sym_name == NULL){
-                dlclose(lto_handle);
--               if(lto_path != NULL)
--                   free(lto_path);
-                return(0);
-            }
-        }

cctools/files/cctools-829-lto.patch

@@ +1 @@
+--- libstuff/lto.c.orig 1969-12-31 16:00:00.000000000 -0800
++++ libstuff/lto.c      2012-08-02 09:15:15.000000000 -0700
+@@ -112,13 +112,19 @@ void **pmod) /* maybe NULL */
+            lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
+ 
+            lto_handle = dlopen(lto_path, RTLD_NOW);
++           free(lto_path);
+            if(lto_handle == NULL){
+-               free(lto_path);
+-               lto_path = NULL;
+-               lto_handle = dlopen("/Applications/Xcode.app/Contents/"
+-                                   "Developer/Toolchains/XcodeDefault."
+-                                   "xctoolchain/usr/lib/libLTO.dylib",
+-                                   RTLD_NOW);
++               const char *lto_paths[] = {
++                   "@@LLVM_LIBDIR@@/libLTO.dylib",
++                   "/Developer/usr/lib/libLTO.dylib",
++                   "/usr/lib/libLTO.dylib",
++                   "/Applications/Xcode.app/usr/lib/libLTO.dylib",
++                   NULL
++               };
++               const char **p;
++               for(p = lto_paths; *p && !lto_handle ; p++) {
++                   lto_handle = dlopen(*p, RTLD_NOW);
++               }
+            }
+            if(lto_handle == NULL)
+                return(0);
+@@ -142,8 +148,6 @@ void **pmod) /* maybe NULL */
+               lto_get_sym_attr == NULL ||
+               lto_get_sym_name == NULL){
+                dlclose(lto_handle);
+-               if(lto_path != NULL)
+-                   free(lto_path);
+                return(0);
+            }
+        }

cctools-headers/Portfile

@@ -2 +2 @@
 
 PortSystem              1.0
 name                    cctools-headers
-version                 822
-revision                2
-set xnu_headers_version 1699.24.8
+version                 829
+set xnu_headers_version 2050.7.9
 categories              devel
 platforms               darwin
 maintainers             mfeiri jeremyhu openmaintainer
@@ -21 +20 @@
 distfiles               cctools-${version}.tar.gz:cctools xnu-${xnu_headers_version}.tar.gz:xnu
 
 checksums               cctools-${version}.tar.gz \
-                        rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
-                        sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289 \
+                        rmd160  55a01500935bf8a6e541ac2109317746c4e7b90d \
+                        sha256  f140b3a2ab7c85b0316afcd816cc8171f81585eea125bca64d781d4e192d65dc \
                         xnu-${xnu_headers_version}.tar.gz \
-                        rmd160  18051c3cb9fca5cecc966306d76b91310bf1e9ff \
-                        sha256  4268ce69799db51f1b48e400b6fa6a7041b266a1a5404034398aa51b7084b269
+                        rmd160  36c43e2ed64e17c2dc31f7c73ce318511437cbeb \
+                        sha256  2957b068ea04db0dbbdbe646f0b2d4e021a814027beacdfc7ae8f43a4d64f01c
 
 supported_archs         noarch
 universal_variant       no