Changeset 97800

Timestamp:

Sep 16, 2012, 6:20:14 AM (12 years ago)

Author:

jeremyhu@…

Message:

ld64: Make it easier to update Makefile in future versions

Location:

trunk/dports/devel/ld64

Files:

• Portfile (modified) (4 diffs)
• files/Makefile-127 (copied) (copied from trunk/dports/devel/ld64/files/Makefile) (3 diffs)
• files/Makefile-133 (copied) (copied from trunk/dports/devel/ld64/files/Makefile)
• files/Makefile-97 (moved) (moved from trunk/dports/devel/ld64/files/Makefile) (3 diffs)
• files/ld64-127-Makefile.patch (deleted)
• files/ld64-97-Makefile.patch (deleted)

trunk/dports/devel/ld64/Portfile

@@ -67 +67 @@
 }
 
+set makefile "Makefile-133"
+
 if {${os.arch} == "powerpc" || ${os.major} < 9} {
     # XCode 3.2.6
@@ -76 +78 @@
     supported_archs     x86_64 i386 ppc
 
+    set makefile        "Makefile-97"
+
     patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch
-    patchfiles-append   ld64-97-no-LTO.patch ld64-97-Makefile.patch
+    patchfiles-append   ld64-97-no-LTO.patch
 } elseif {${os.major} < 11} {
     # XCode 4.2
@@ -87 +91 @@
     supported_archs     i386 x86_64
 
+    set makefile        "Makefile-127"
+
     patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch
-    patchfiles-append   ld64-127-any-cctools.patch ld64-127-Makefile.patch
+    patchfiles-append   ld64-127-any-cctools.patch
 }
 
@@ -117 +123 @@
 
 post-extract {
-    file copy ${filespath}/Makefile ${worksrcpath}
+    file copy ${filespath}/${makefile} ${worksrcpath}
 }
 

trunk/dports/devel/ld64/files/Makefile-127

@@ -21 +21 @@
 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
@@ -48 +41 @@
 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
@@ -63 +55 @@
 ld : src/ld/passes/huge.o
 ld : src/ld/passes/objc.o
-ld : src/ld/passes/order.o
+ld : src/ld/passes/order_file.o
 ld : src/ld/passes/tlvp.o
 ld : src/ld/passes/stubs/stubs.o

trunk/dports/devel/ld64/files/Makefile-97

@@ -4 +4 @@
 endif
 
-CPPFLAGS = $(LLVM_CPPFLAGS) -Isrc/abstraction -Isrc/ld -Isrc/ld/parsers $(OTHER_CPPFLAGS)
+CPPFLAGS = $(LLVM_CPPFLAGS) -Isrc/abstraction -Isrc/ld $(OTHER_CPPFLAGS)
 CFLAGS = -Os $(OTHER_CFLAGS)
 CXXFLAGS = -Os $(OTHER_CXXFLAGS)
@@ -21 +21 @@
 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 $@
@@ -44 +35 @@
 ld : src/ld/debugline.o
 ld : src/ld/ld.o
-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
-ld : src/ld/parsers/macho_dylib_file.o
-ld : src/ld/parsers/macho_relocatable_file.o
-ld : src/ld/parsers/opaque_section_file.o
-ld : src/ld/passes/branch_island.o
-ld : src/ld/passes/branch_shim.o
-ld : src/ld/passes/compact_unwind.o
-ld : src/ld/passes/dtrace_dof.o
-ld : src/ld/passes/dylibs.o
-ld : src/ld/passes/got.o
-ld : src/ld/passes/huge.o
-ld : src/ld/passes/objc.o
-ld : src/ld/passes/order.o
-ld : src/ld/passes/tlvp.o
-ld : src/ld/passes/stubs/stubs.o
         $(CXX) $(LLVM_LDFLAGS) $(LDFLAGS) $(OTHER_LDFLAGS_LD64) -Wl,-exported_symbol,__mh_execute_header $^ -o $@