[97395] trunk/dports/devel/ld64

jeremyhu at macports.org jeremyhu at macports.org
Tue Sep 4 14:52:22 PDT 2012 

Revision: 97395
          https://trac.macports.org/changeset/97395
Author:   jeremyhu at macports.org
Date:     2012-09-04 14:52:22 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
ld64: Bump to version 133.3

Modified Paths:
--------------
    trunk/dports/devel/ld64/Portfile
    trunk/dports/devel/ld64/files/Makefile
    trunk/dports/devel/ld64/files/ld64-127-Makefile.patch
    trunk/dports/devel/ld64/files/ld64-97-Makefile.patch

Added Paths:
-----------
    trunk/dports/devel/ld64/files/ld64-133-no-CrashReporterClient.h.patch

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2012-09-04 21:45:25 UTC (rev 97394)
+++ trunk/dports/devel/ld64/Portfile	2012-09-04 21:52:22 UTC (rev 97395)
@@ -6,9 +6,8 @@
 # revbump cctools whenever this port updates
 
 name                    ld64
-# XCode 4.3
-version                 128.2
-revision                4
+# XCode 4.4
+version                 133.3
 set llvm_version        3.0
 categories              devel
 platforms               darwin
@@ -24,10 +23,10 @@
                         resolves references, and produces an ouput file.
 
 checksums               ${distname}${extract.suffix} \
-                        rmd160  0da68b89669233d7b6cc6ebdb92482e191bc9051 \
-                        sha256  96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7
+                        rmd160  4099dbcbc296d618c6e08b1cd01f73e640a477b0 \
+                        sha256  d641e7820b4fd4cac2bc3c1038149f02503a883a145a588860dc6a283399129f
 
-patchfiles              ld64-version.patch
+patchfiles              ld64-version.patch ld64-133-no-CrashReporterClient.h.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
@@ -75,6 +74,7 @@
                         sha256  02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d181840866fb87f036b4e089
     supported_archs     x86_64 i386 ppc
 
+    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch
     patchfiles-append   ld64-97-no-LTO.patch ld64-97-Makefile.patch
 } elseif {${os.major} < 11} {
     # XCode 4.2
@@ -85,6 +85,7 @@
                         sha256  97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
     supported_archs     i386 x86_64
 
+    patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch
     patchfiles-append   ld64-127-any-cctools.patch ld64-127-Makefile.patch
 }
 
@@ -139,6 +140,11 @@
     OTHER_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags]" \
     OTHER_LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
 
+if {${os.major} >= 11} {
+    build.args-append \
+        RC_SUPPORTED_ARCHS="armv6 armv7 i386 x86_64"
+}
+
 destroot.args \
     PREFIX=${prefix}
 

Modified: trunk/dports/devel/ld64/files/Makefile
===================================================================
--- trunk/dports/devel/ld64/files/Makefile	2012-09-04 21:45:25 UTC (rev 97394)
+++ trunk/dports/devel/ld64/files/Makefile	2012-09-04 21:52:22 UTC (rev 97395)
@@ -20,10 +20,17 @@
 
 all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
 
+src/ld/Snapshot.o : src/ld/compile_stubs.h
+src/ld/compile_stubs.h : compile_stubs
+	echo "static const char *compile_stubs = " > $@
+	cat $^ | sed s/\"/\\\\\"/g | sed s/^/\"/ | sed s/$$/\\\\n\"/ >> $@
+	echo ";" >> $@
+
 src/ld/ld.o : src/ld/configure.h
+src/other/ObjectDump.o : src/ld/configure.h
 src/ld/Options.o : src/ld/configure.h
-src/ld/configure.h :
-	touch $@
+src/ld/configure.h : src/create_configure
+	DERIVED_SOURCES_DIR=src/ld DERIVED_FILE_DIR=src/ld $^ > $@
 
 ObjectDump : src/ld/debugline.o
 ObjectDump : src/ld/parsers/macho_relocatable_file.o 
@@ -40,6 +47,7 @@
 ld : src/ld/Options.o
 ld : src/ld/OutputFile.o
 ld : src/ld/Resolver.o
+ld : src/ld/Snapshot.o
 ld : src/ld/SymbolTable.o
 ld : src/ld/parsers/archive_file.o
 ld : src/ld/parsers/lto_file.o

Modified: trunk/dports/devel/ld64/files/ld64-127-Makefile.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-127-Makefile.patch	2012-09-04 21:45:25 UTC (rev 97394)
+++ trunk/dports/devel/ld64/files/ld64-127-Makefile.patch	2012-09-04 21:52:22 UTC (rev 97395)
@@ -1,6 +1,34 @@
---- Makefile
-+++ Makefile
-@@ -54,7 +54,7 @@ ld : src/ld/passes/dylibs.o
+--- Makefile-133	2012-09-04 14:50:18.000000000 -0700
++++ Makefile	2012-09-04 14:49:26.000000000 -0700
+@@ -20,17 +20,10 @@ endif
+ 
+ all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
+ 
+-src/ld/Snapshot.o : src/ld/compile_stubs.h
+-src/ld/compile_stubs.h : compile_stubs
+-	echo "static const char *compile_stubs = " > $@
+-	cat $^ | sed s/\"/\\\\\"/g | sed s/^/\"/ | sed s/$$/\\\\n\"/ >> $@
+-	echo ";" >> $@
+-
+ src/ld/ld.o : src/ld/configure.h
+-src/other/ObjectDump.o : src/ld/configure.h
+ src/ld/Options.o : src/ld/configure.h
+-src/ld/configure.h : src/create_configure
+-	DERIVED_SOURCES_DIR=src/ld DERIVED_FILE_DIR=src/ld $^ > $@
++src/ld/configure.h :
++	touch $@
+ 
+ ObjectDump : src/ld/debugline.o
+ ObjectDump : src/ld/parsers/macho_relocatable_file.o 
+@@ -47,7 +40,6 @@ ld : src/ld/InputFiles.o
+ ld : src/ld/Options.o
+ ld : src/ld/OutputFile.o
+ ld : src/ld/Resolver.o
+-ld : src/ld/Snapshot.o
+ ld : src/ld/SymbolTable.o
+ ld : src/ld/parsers/archive_file.o
+ ld : src/ld/parsers/lto_file.o
+@@ -62,7 +54,7 @@ ld : src/ld/passes/dylibs.o
  ld : src/ld/passes/got.o
  ld : src/ld/passes/huge.o
  ld : src/ld/passes/objc.o

Added: trunk/dports/devel/ld64/files/ld64-133-no-CrashReporterClient.h.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-133-no-CrashReporterClient.h.patch	                        (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-133-no-CrashReporterClient.h.patch	2012-09-04 21:52:22 UTC (rev 97395)
@@ -0,0 +1,21 @@
+--- src/ld/Options.cpp.orig	2012-09-04 14:00:10.000000000 -0700
++++ src/ld/Options.cpp	2012-09-04 14:00:37.000000000 -0700
+@@ -50,7 +50,7 @@ namespace lto {
+ // magic to place command line in crash reports
+ const int crashreporterBufferSize = 2000;
+ static char crashreporterBuffer[crashreporterBufferSize];
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++#if 0 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ 	#include <CrashReporterClient.h>
+ 	// hack until ld does not need to build on 10.6 anymore
+     struct crashreporter_annotations_t gCRAnnotations 
+@@ -4246,7 +4247,7 @@ void Options::checkForClassic(int argc, 
+ 	bool newLinker = false;
+ 	
+ 	// build command line buffer in case ld crashes
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++#if 0 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ 	CRSetCrashLogMessage(crashreporterBuffer);
+ #endif
+ 	const char* srcRoot = getenv("SRCROOT");
+

Modified: trunk/dports/devel/ld64/files/ld64-97-Makefile.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-97-Makefile.patch	2012-09-04 21:45:25 UTC (rev 97394)
+++ trunk/dports/devel/ld64/files/ld64-97-Makefile.patch	2012-09-04 21:52:22 UTC (rev 97395)
@@ -1,6 +1,6 @@
---- Makefile
-+++ Makefile
-@@ -3,7 +3,7 @@ LLVM_CPPFLAGS := -I$(shell $(LLVM_CONFIG) --includedir) -DLTO_SUPPORT
+--- Makefile-133	2012-09-04 14:50:18.000000000 -0700
++++ Makefile	2012-09-04 14:50:51.000000000 -0700
+@@ -3,7 +3,7 @@ LLVM_CPPFLAGS := -I$(shell $(LLVM_CONFIG
  LLVM_LDFLAGS := -L$(shell $(LLVM_CONFIG) --libdir) -lLTO
  endif
  
@@ -9,16 +9,31 @@
  CFLAGS = -Os $(OTHER_CFLAGS)
  CXXFLAGS = -Os $(OTHER_CXXFLAGS)
  LDFLAGS = $(OTHER_LDFLAGS)
-@@ -26,8 +26,6 @@ src/ld/configure.h :
- 	touch $@
+@@ -20,21 +20,12 @@ endif
  
+ all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
+ 
+-src/ld/Snapshot.o : src/ld/compile_stubs.h
+-src/ld/compile_stubs.h : compile_stubs
+-	echo "static const char *compile_stubs = " > $@
+-	cat $^ | sed s/\"/\\\\\"/g | sed s/^/\"/ | sed s/$$/\\\\n\"/ >> $@
+-	echo ";" >> $@
+-
+ src/ld/ld.o : src/ld/configure.h
+-src/other/ObjectDump.o : src/ld/configure.h
+ src/ld/Options.o : src/ld/configure.h
+-src/ld/configure.h : src/create_configure
+-	DERIVED_SOURCES_DIR=src/ld DERIVED_FILE_DIR=src/ld $^ > $@
++src/ld/configure.h :
++	touch $@
+ 
  ObjectDump : src/ld/debugline.o
 -ObjectDump : src/ld/parsers/macho_relocatable_file.o 
 -ObjectDump : src/ld/parsers/lto_file.o
  ObjectDump : src/other/ObjectDump.o 
  	$(CXX) $(LLVM_LDFLAGS) $(LDFLAGS) $^ -o $@
  
-@@ -36,27 +34,7 @@ dyldinfo : src/other/dyldinfo.o
+@@ -43,28 +34,7 @@ dyldinfo : src/other/dyldinfo.o
  
  ld : src/ld/debugline.o
  ld : src/ld/ld.o
@@ -26,6 +41,7 @@
  ld : src/ld/Options.o
 -ld : src/ld/OutputFile.o
 -ld : src/ld/Resolver.o
+-ld : src/ld/Snapshot.o
 -ld : src/ld/SymbolTable.o
 -ld : src/ld/parsers/archive_file.o
 -ld : src/ld/parsers/lto_file.o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120904/3c7fdb62/attachment.html>

More information about the macports-changes mailing list