[100587] trunk/dports/devel/ld64

[jeremyhu at macports.org]

Revision: 100587
          https://trac.macports.org/changeset/100587
Author:   jeremyhu at macports.org
Date:     2012-12-16 10:22:33 -0800 (Sun, 16 Dec 2012)
Log Message:
-----------
ld64: Fix crash when linking mpich2 (#36654)

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

Added Paths:
-----------
    trunk/dports/devel/ld64/files/ld64-134-PR-36654.patch

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2012-12-16 18:20:27 UTC (rev 100586)
+++ trunk/dports/devel/ld64/Portfile	2012-12-16 18:22:33 UTC (rev 100587)
@@ -8,7 +8,7 @@
 name                    ld64
 # XCode 4.5
 version                 134.9
-set llvm_version        3.0
+revision                1
 categories              devel
 platforms               darwin
 maintainers             mfeiri jeremyhu
@@ -25,7 +25,7 @@
 checksums               rmd160  9464743da9603af5e5a8f27c51e2fea177e0c1c5 \
                         sha256  938bad7aa53999ca9e2b6e6d55a1ccbec0bd2afc743ce8c1a0e8f9ccc6d6df1b
 
-patchfiles              ld64-version.patch ld64-133-no-CrashReporterClient.h.patch
+patchfiles              ld64-version.patch ld64-133-no-CrashReporterClient.h.patch ld64-134-PR-36654.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
@@ -77,13 +77,13 @@
 
     set makefile	"Makefile-97"
 
-    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch
+    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-134-PR-36654.patch
     patchfiles-append   ld64-97-no-LTO.patch ld64-97-ppc-branch-island.patch
 } elseif {${os.major} < 11} {
     # XCode 4.2
     # This was the last ld64 release that supported linking ppc executables.
     version             127.2
-    revision            5
+    revision            6
     checksums           rmd160  8ee709341549a1944732daef6ebab7ef1acfcc6e \
                         sha256  97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
     supported_archs     i386 x86_64

Added: trunk/dports/devel/ld64/files/ld64-134-PR-36654.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-134-PR-36654.patch	                        (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-134-PR-36654.patch	2012-12-16 18:22:33 UTC (rev 100587)
@@ -0,0 +1,11 @@
+--- src/ld/OutputFile.cpp
++++ src/ld/OutputFile.cpp
+@@ -2421,6 +2421,8 @@ bool OutputFile::isPcRelStore(ld::Fixup::Kind kind)
+ 		case ld::Fixup::kindStoreTargetAddressX86PCRel32:
+ 		case ld::Fixup::kindStoreTargetAddressX86PCRel32GOTLoad:
+ 		case ld::Fixup::kindStoreTargetAddressX86PCRel32GOTLoadNowLEA:
++		case ld::Fixup::kindStoreTargetAddressX86PCRel32TLVLoad:
++		case ld::Fixup::kindStoreTargetAddressX86PCRel32TLVLoadNowLEA:
+ 		case ld::Fixup::kindStoreTargetAddressARMBranch24:
+ 		case ld::Fixup::kindStoreTargetAddressThumbBranch22:
+ 		case ld::Fixup::kindStoreTargetAddressARMLoad12:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121216/0e640d9d/attachment.html>