[97396] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Tue Sep 4 15:04:31 PDT 2012
Revision: 97396
https://trac.macports.org/changeset/97396
Author: jeremyhu at macports.org
Date: 2012-09-04 15:04:29 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
cctools: Bump to version 829
Modified Paths:
--------------
trunk/dports/devel/cctools/Portfile
trunk/dports/devel/cctools-headers/Portfile
Added Paths:
-----------
trunk/dports/devel/cctools/files/cctools-806-lto.patch
trunk/dports/devel/cctools/files/cctools-829-lto.patch
Removed Paths:
-------------
trunk/dports/devel/cctools/files/lto.patch
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2012-09-04 21:52:22 UTC (rev 97395)
+++ trunk/dports/devel/cctools/Portfile 2012-09-04 22:04:29 UTC (rev 97396)
@@ -2,9 +2,8 @@
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,13 +16,13 @@
homepage http://opensource.apple.com/source/${name}/
master_sites http://opensource.apple.com/tarballs/${name}/
-checksums rmd160 1caf207acbf421cdc975926a392fc75dc1d2594c \
- sha256 dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
+checksums 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,8 +35,8 @@
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
+ patchfiles-append cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch
} else {
supported_archs i386 x86_64
}
Copied: trunk/dports/devel/cctools/files/cctools-806-lto.patch (from rev 97327, trunk/dports/devel/cctools/files/lto.patch)
===================================================================
--- trunk/dports/devel/cctools/files/cctools-806-lto.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-806-lto.patch 2012-09-04 22:04:29 UTC (rev 97396)
@@ -0,0 +1,35 @@
+--- 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);
+ }
+ }
Added: trunk/dports/devel/cctools/files/cctools-829-lto.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-829-lto.patch (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-829-lto.patch 2012-09-04 22:04:29 UTC (rev 97396)
@@ -0,0 +1,39 @@
+--- libstuff/lto.c.orig 1969-12-31 16:00:00.000000000 -0800
++++ libstuff/lto.c 2012-09-04 14:59:31.000000000 -0700
+@@ -112,13 +112,21 @@ void **pmod) /* maybe NULL */
+ lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
+
+ lto_handle = dlopen(lto_path, RTLD_NOW);
++ free(lto_path);
++ lto_path = NULL;
+ 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",
++ "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/libLTO.dylib",
++ "/usr/lib/libLTO.dylib",
++ "/Applications/Xcode.app/usr/lib/libLTO.dylib",
++ "/Developer/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 +150,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);
+ }
+ }
Deleted: trunk/dports/devel/cctools/files/lto.patch
===================================================================
--- trunk/dports/devel/cctools/files/lto.patch 2012-09-04 21:52:22 UTC (rev 97395)
+++ trunk/dports/devel/cctools/files/lto.patch 2012-09-04 22:04:29 UTC (rev 97396)
@@ -1,35 +0,0 @@
---- 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);
- }
- }
Modified: trunk/dports/devel/cctools-headers/Portfile
===================================================================
--- trunk/dports/devel/cctools-headers/Portfile 2012-09-04 21:52:22 UTC (rev 97395)
+++ trunk/dports/devel/cctools-headers/Portfile 2012-09-04 22:04:29 UTC (rev 97396)
@@ -2,9 +2,8 @@
PortSystem 1.0
name cctools-headers
-version 822
-revision 2
-set xnu_headers_version 1699.24.8
+version 829
+set xnu_headers_version 2050.9.2
categories devel
platforms darwin
maintainers mfeiri jeremyhu openmaintainer
@@ -20,12 +19,12 @@
distname cctools-${version}
distfiles cctools-${version}.tar.gz:cctools xnu-${xnu_headers_version}.tar.gz:xnu
-checksums cctools-${version}.tar.gz \
- rmd160 1caf207acbf421cdc975926a392fc75dc1d2594c \
- sha256 dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289 \
- xnu-${xnu_headers_version}.tar.gz \
- rmd160 18051c3cb9fca5cecc966306d76b91310bf1e9ff \
- sha256 4268ce69799db51f1b48e400b6fa6a7041b266a1a5404034398aa51b7084b269
+checksums cctools-829.tar.gz \
+ rmd160 55a01500935bf8a6e541ac2109317746c4e7b90d \
+ sha256 f140b3a2ab7c85b0316afcd816cc8171f81585eea125bca64d781d4e192d65dc \
+ xnu-2050.9.2.tar.gz \
+ rmd160 b874ebec10504e0eac63dcbc8c85960e7dc7a47f \
+ sha256 f342179c625413ae3a74fc1a5747fc555c1353cfef6259c595626469744a6405
supported_archs noarch
universal_variant no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120904/c31686eb/attachment.html>
More information about the macports-changes
mailing list