[120116] trunk/dports/devel

jeremyhu at macports.org jeremyhu at macports.org
Thu May 15 19:02:23 PDT 2014


Revision: 120116
          https://trac.macports.org/changeset/120116
Author:   jeremyhu at macports.org
Date:     2014-05-15 19:02:23 -0700 (Thu, 15 May 2014)
Log Message:
-----------
cctools and ld64: Bump to Xcode 5.1 versions

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile
    trunk/dports/devel/cctools-headers/Portfile
    trunk/dports/devel/ld64/Portfile
    trunk/dports/devel/ld64/files/ld64-version.patch

Added Paths:
-----------
    trunk/dports/devel/ld64/files/PR-16935960.patch
    trunk/dports/devel/ld64/files/PR-16936488.patch

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2014-05-16 01:50:57 UTC (rev 120115)
+++ trunk/dports/devel/cctools/Portfile	2014-05-16 02:02:23 UTC (rev 120116)
@@ -3,8 +3,8 @@
 PortSystem              1.0
 
 name                    cctools
-# OS X 10.9
-version                 845
+# Xcode 5.1
+version                 855
 revision                1
 categories              devel
 platforms               darwin
@@ -19,8 +19,8 @@
 homepage                http://opensource.apple.com/source/${name}/
 master_sites            http://opensource.apple.com/tarballs/${name}/
 
-checksums               rmd160  1adba776519f3175593897eef1ad90ab657d7e65 \
-                        sha256  29890a50772a9a5ab93f0c0b63f2bd51c807f24834e2e40244bf166f8a526829
+checksums               rmd160  82e2a198ceedd3aae8b22b8455c6d0aacf36705f \
+                        sha256  751748ddf32c8ea84c175f32792721fa44424dad6acbf163f84f41e9617dbc58
 
 # Just use the host's until the port is fixed port:xnu-headers
 

Modified: trunk/dports/devel/cctools-headers/Portfile
===================================================================
--- trunk/dports/devel/cctools-headers/Portfile	2014-05-16 01:50:57 UTC (rev 120115)
+++ trunk/dports/devel/cctools-headers/Portfile	2014-05-16 02:02:23 UTC (rev 120116)
@@ -2,7 +2,7 @@
 
 PortSystem              1.0
 name                    cctools-headers
-version                 845
+version                 855
 categories              devel
 platforms               darwin
 maintainers             jeremyhu openmaintainer
@@ -16,8 +16,8 @@
 
 distname                cctools-${version}
 
-checksums               rmd160  1adba776519f3175593897eef1ad90ab657d7e65 \
-                        sha256  29890a50772a9a5ab93f0c0b63f2bd51c807f24834e2e40244bf166f8a526829
+checksums               rmd160  82e2a198ceedd3aae8b22b8455c6d0aacf36705f \
+                        sha256  751748ddf32c8ea84c175f32792721fa44424dad6acbf163f84f41e9617dbc58
 
 supported_archs         noarch
 universal_variant       no

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2014-05-16 01:50:57 UTC (rev 120115)
+++ trunk/dports/devel/ld64/Portfile	2014-05-16 02:02:23 UTC (rev 120116)
@@ -6,9 +6,8 @@
 # revbump cctools whenever this port updates
 
 name                    ld64
-# XCode 4.6
-version                 136
-revision                2
+# XCode 5.1
+version                 236.3
 categories              devel
 platforms               darwin
 maintainers             jeremyhu
@@ -22,10 +21,10 @@
 long_description        ld64 combines several object files and libraries, \
                         resolves references, and produces an ouput file.
 
-checksums               rmd160  4a2930ccdd398b63a108810e90293ab96dc154a0 \
-                        sha256  99d6c4acb6d4cdf45772951dd2308222aa966763170137459a9d276674645d9e
+checksums               rmd160  6a3f44aa9ae57a60d2cff5b3d47be7972ad83029 \
+                        sha256  8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6
 
-patchfiles              ld64-version.patch ld64-133-no-CrashReporterClient.h.patch ld64-134-missing-include.patch ld64-136-i386-badAddress.patch
+patchfiles              ld64-version.patch ld64-133-no-CrashReporterClient.h.patch ld64-134-missing-include.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
 
 # We don't set llvmXX as the default variant on Tiger because it would introduce a
 # dependency cycle as llvm requires apple-gcc42 and ld64 to build correctly.  Users
@@ -108,7 +107,7 @@
 
     set makefile	"Makefile-97"
 
-    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-134-missing-include.patch ld64-136-i386-badAddress.patch
+    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-134-missing-include.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
     patchfiles-append   ld64-97-no-LTO.patch ld64-97-ppc-branch-island.patch ld64-97-arm_types_PR38931.patch
 } elseif {${os.major} < 10} {
     # XCode 4.2
@@ -121,7 +120,7 @@
 
     set makefile	"Makefile-127"
 
-    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-136-i386-badAddress.patch
+    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
     patchfiles-append   ld64-127-any-cctools.patch
 } elseif {${cxxstdlib} eq "libstdc++"} {
     patchfiles-append   ld64-136-hash_set.patch

Added: trunk/dports/devel/ld64/files/PR-16935960.patch
===================================================================
--- trunk/dports/devel/ld64/files/PR-16935960.patch	                        (rev 0)
+++ trunk/dports/devel/ld64/files/PR-16935960.patch	2014-05-16 02:02:23 UTC (rev 120116)
@@ -0,0 +1,15 @@
+--- src/other/ObjectDump.cpp.orig	2014-04-04 15:42:29.000000000 -0700
++++ src/other/ObjectDump.cpp	2014-05-15 18:07:09.000000000 -0700
+@@ -990,12 +990,6 @@ void dumper::dumpFixup(const ld::Fixup* 
+ 		case ld::Fixup::kindStoreTargetAddressARM64PageOff12:
+ 			printf("ARM64 store 12-bit page offset of %s", referenceTargetAtomName(ref));
+ 			break;
+-		case ld::Fixup::kindStoreTargetAddressARM64TLVPage21:
+-			printf("ARM64 store 21-bit pcrel ADRP to TLV for %s", referenceTargetAtomName(ref));
+-			break;
+-		case ld::Fixup::kindStoreTargetAddressARM64TLVPageOff12:
+-			printf("ARM64 store 12-bit page offset of TLV of %s", referenceTargetAtomName(ref));
+-			break;
+ 		case ld::Fixup::kindStoreTargetAddressARM64GOTLoadPage21:
+ 			printf("ARM64 store 21-bit pcrel ADRP to GOT for %s", referenceTargetAtomName(ref));
+ 			break;

Added: trunk/dports/devel/ld64/files/PR-16936488.patch
===================================================================
--- trunk/dports/devel/ld64/files/PR-16936488.patch	                        (rev 0)
+++ trunk/dports/devel/ld64/files/PR-16936488.patch	2014-05-16 02:02:23 UTC (rev 120116)
@@ -0,0 +1,20 @@
+--- src/ld/parsers/macho_dylib_file.cpp.orig	2014-05-15 18:59:17.000000000 -0700
++++ src/ld/parsers/macho_dylib_file.cpp	2014-05-15 18:59:32.000000000 -0700
+@@ -1074,17 +1074,6 @@ bool isDylibFile(const uint8_t* fileCont
+ 		*subResult = CPU_SUBTYPE_ARM64_ALL;
+ 		return true;
+ 	}
+-	if ( Parser<ppc>::validFile(fileContent, false) ) {
+-		*result = CPU_TYPE_POWERPC;
+-		const macho_header<Pointer32<BigEndian> >* header = (const macho_header<Pointer32<BigEndian> >*)fileContent;
+-		*subResult = header->cpusubtype();
+-		return true;
+-	}
+-	if ( Parser<ppc64>::validFile(fileContent, false) ) {
+-		*result = CPU_TYPE_POWERPC64;
+-		*subResult = CPU_SUBTYPE_POWERPC_ALL;
+-		return true;
+-	}
+ 	return false;
+ }
+ 

Modified: trunk/dports/devel/ld64/files/ld64-version.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-version.patch	2014-05-16 01:50:57 UTC (rev 120115)
+++ trunk/dports/devel/ld64/files/ld64-version.patch	2014-05-16 02:02:23 UTC (rev 120116)
@@ -4,7 +4,7 @@
  
  #include "Options.h"
  
-+const char *ldVersionString = "@(#)PROGRAM:ld  PROJECT:ld64-@@VERSION@@\n";
++const char ldVersionString[] = "@(#)PROGRAM:ld  PROJECT:ld64-@@VERSION@@\n";
 +
  void throwf(const char* format, ...)
  {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140515/017c56dd/attachment-0001.html>


More information about the macports-changes mailing list