[92440] trunk/dports/devel/ld64
jeremyhu at macports.org
jeremyhu at macports.org
Sat Apr 28 13:39:38 PDT 2012
Revision: 92440
https://trac.macports.org/changeset/92440
Author: jeremyhu at macports.org
Date: 2012-04-28 13:39:35 -0700 (Sat, 28 Apr 2012)
Log Message:
-----------
ld64: Bump Tiger and ppc to ld64-97.17, replace XCode build with a Makefile to use the right compiler
Modified Paths:
--------------
trunk/dports/devel/ld64/Portfile
Added Paths:
-----------
trunk/dports/devel/ld64/files/Makefile
trunk/dports/devel/ld64/files/ld64-127-Makefile.patch
trunk/dports/devel/ld64/files/ld64-97-Makefile.patch
trunk/dports/devel/ld64/files/ld64-97-no-LTO.patch
Removed Paths:
-------------
trunk/dports/devel/ld64/files/ld64-85-no_pie.patch
trunk/dports/devel/ld64/files/ld64-85-pbxproj.patch
trunk/dports/devel/ld64/files/ld64-85-version.patch
trunk/dports/devel/ld64/files/ld64-pbxproj.patch
trunk/dports/devel/ld64/files/patch-MATH85-ld.cpp.diff
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2012-04-28 20:07:43 UTC (rev 92439)
+++ trunk/dports/devel/ld64/Portfile 2012-04-28 20:39:35 UTC (rev 92440)
@@ -1,9 +1,6 @@
# $Id$
PortSystem 1.0
-PortGroup xcode 1.0
-PortGroup xcodeversion 1.0
-minimum_xcodeversions {10 3.2.3}
# cctools uses a static library from this port when it builds, please
# revbump cctools whenever this port updates
@@ -14,6 +11,7 @@
revision 3
set llvm_version 3.0
categories devel
+platforms darwin
maintainers mfeiri jeremyhu
homepage http://opensource.apple.com/source/${name}/
master_sites http://opensource.apple.com/tarballs/${name}/
@@ -29,7 +27,7 @@
rmd160 0da68b89669233d7b6cc6ebdb92482e191bc9051 \
sha256 96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7
-patchfiles ld64-pbxproj.patch ld64-version.patch
+patchfiles ld64-version.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
@@ -45,6 +43,8 @@
}
}
+variant universal {}
+
set llvm_version {}
variant llvm29 conflicts llvm30 llvm31 description {Use llvm-2.9 for libLTO} {
set llvm_version 2.9
@@ -62,19 +62,14 @@
}
if {${os.arch} == "powerpc" || ${os.major} < 9} {
- # XCode 3.1.4
- # 97.17 could work, but it requires gcc-4.2 to build, and xcodebuild
- # isn't UsingTheRightCompiler. We could use it for Leopard/ppc, but
- # I don't want to support too many different versions.
- version 85.2.1
- revision 6
- checksums rmd160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 \
- sha256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804
- supported_archs i386 ppc
+ # 127.2 should work for powerpc, but it will require some build fixes.
+ version 97.17
+ revision 0
+ checksums rmd160 d52df7d7f741c8bedd29cbac73dbb9db992b4795 \
+ sha256 02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d181840866fb87f036b4e089
+ supported_archs x86_64 i386 ppc
- patchfiles-delete ld64-pbxproj.patch ld64-version.patch
- patchfiles-append patch-MATH85-ld.cpp.diff ld64-85-pbxproj.patch \
- ld64-85-version.patch ld64-85-no_pie.patch
+ patchfiles-append ld64-97-no-LTO.patch ld64-97-Makefile.patch
} elseif {${os.major} < 11} {
# XCode 3.2.6
# This was the last XCode release that supported linking ppc executables.
@@ -84,7 +79,7 @@
sha256 97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
supported_archs i386 x86_64
- patchfiles-append ld64-127-any-cctools.patch
+ patchfiles-append ld64-127-any-cctools.patch ld64-127-Makefile.patch
}
platform darwin 8 {
@@ -98,71 +93,52 @@
}
}
-xcode.target all ObjectDump machocheck
-xcode.destroot.path ${prefix}/bin
-
-post-patch {
- set extra_flags {}
-
- if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31]} {
- reinplace "s|-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib|-Wl,-lazy_library,[exec ${prefix}/bin/llvm-config-mp-${llvm_version} --libdir]/libLTO.dylib|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|MACPORTS_LLVM_INCLUDEDIR|[exec ${prefix}/bin/llvm-config-mp-${llvm_version} --includedir]|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
-
- set extra_flags [exec ${prefix}/bin/llvm-config-mp-${llvm_version} --cflags]
- } else {
- reinplace "s|-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib||g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+if {${configure.compiler} == "gcc-4.0"} {
+ configure.compiler gcc-4.2
+ if {![file exists ${configure.cc}]} {
+ depends_build-append port:apple-gcc42
+ depends_skip_archcheck-append apple-gcc42
+ configure.compiler apple-gcc-4.2
}
+}
- reinplace "s|MACPORTS_CFLAGS|-I${prefix}/include ${extra_flags}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|MACPORTS_CPLUSPLUSFLAGS|-I${prefix}/include ${extra_flags}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+post-extract {
+ file copy ${filespath}/Makefile ${worksrcpath}
+}
- reinplace "s|/usr/share/man/man1|${prefix}/share/man/man1|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|usr/share/man/man1|${prefix}/share/man/man1|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|/usr/local|${prefix}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|/SDKs/Extra/usr|${prefix}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|/Developer${prefix}|${prefix}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|\$(DEVELOPER_DIR)/usr|${prefix}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|\$(DEVELOPER_DIR)${prefix}|${prefix}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "s|\$(RC_ProjectSourceVersion)|${version}|g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- reinplace "/VERSIONING_SYSTEM/d" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+post-patch {
+ reinplace "s|@@VERSION@@|${version}|g" \
+ ${worksrcpath}/src/ld/Options.cpp
- if {[file exists ${worksrcpath}/src/ld/Options.cpp]} {
- reinplace "s|@@VERSION@@|${version}|g" \
- ${worksrcpath}/src/ld/Options.cpp
- } else {
- reinplace "s|@@VERSION@@|${version}|g" \
- ${worksrcpath}/src/Options.cpp
- }
-
if {${os.major} < 9} {
- reinplace "s:-lazy_library,::g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
-
# No CommonCrypto, use openssl
reinplace "s:<CommonCrypto/CommonDigest.h>:<openssl/md5.h>:" \
- ${worksrcpath}/src/MachOWriterExecutable.hpp
+ ${worksrcpath}/src/ld/MachOWriterExecutable.hpp
reinplace "s:CC_MD5:MD5:" \
- ${worksrcpath}/src/MachOWriterExecutable.hpp
- reinplace "s:MACPORTS_LD64_LDFLAGS:-lcrypto:g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
- } else {
- reinplace "s:MACPORTS_LD64_LDFLAGS::g" \
- ${worksrcpath}/ld64.xcodeproj/project.pbxproj
+ ${worksrcpath}/src/ld/MachOWriterExecutable.hpp
+ }
+}
+
+use_configure no
+build.args \
+ CC="${configure.cc}" \
+ CXX="${configure.cxx}" \
+ OTHER_CPPFLAGS="${configure.cppflags}" \
+ OTHER_CFLAGS="${configure.cflags} [get_canonical_archflags]" \
+ OTHER_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags]" \
+ OTHER_LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
+
+destroot.args \
+ PREFIX=${prefix}
+
+pre-build {
+ if {[variant_isset llvm29] || [variant_isset llvm30] || [variant_isset llvm31]} {
+ build.args-append LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version}
}
+
+ if {${os.major} < 9} {
+ build.args-append OTHER_LDFLAGS_LD64=-lcrypto
+ }
}
post-destroot {
@@ -175,10 +151,6 @@
system "install_name_tool -change ${prefix}/libexec/llvm-${llvm_version}/lib/libLTO.dylib \
@executable_path/../lib/libLTO.dylib ${destroot}${prefix}/libexec/ld64/ld"
}
-
- if {[file exists ${destroot}${prefix}/bin/libprunetrie.a]} {
- file rename ${destroot}${prefix}/bin/libprunetrie.a ${destroot}${prefix}/lib/libprunetrie.a
- }
}
livecheck.type regex
Added: trunk/dports/devel/ld64/files/Makefile
===================================================================
--- trunk/dports/devel/ld64/files/Makefile (rev 0)
+++ trunk/dports/devel/ld64/files/Makefile 2012-04-28 20:39:35 UTC (rev 92440)
@@ -0,0 +1,94 @@
+ifdef LLVM_CONFIG
+LLVM_CPPFLAGS := -I$(shell $(LLVM_CONFIG) --includedir) -DLTO_SUPPORT
+LLVM_LDFLAGS := -L$(shell $(LLVM_CONFIG) --libdir) -lLTO
+endif
+
+CPPFLAGS = $(LLVM_CPPFLAGS) -Isrc/abstraction -Isrc/ld -Isrc/ld/parsers $(OTHER_CPPFLAGS)
+CFLAGS = -Os $(OTHER_CFLAGS)
+CXXFLAGS = -Os $(OTHER_CXXFLAGS)
+LDFLAGS = $(OTHER_LDFLAGS)
+
+ifndef RANLIB
+RANLIB = ranlib
+endif
+ifndef AR
+AR = ar
+endif
+ifndef PREFIX
+PREFIX = /usr
+endif
+
+all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
+
+src/ld/ld.o : src/ld/configure.h
+src/ld/Options.o : src/ld/configure.h
+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 $@
+
+dyldinfo : src/other/dyldinfo.o
+ $(CXX) $(LDFLAGS) -Wl,-exported_symbol,__mh_execute_header $^ -o $@
+
+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/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 $@
+
+machocheck : src/other/machochecker.o
+ $(CXX) $(LDFLAGS) $^ -o $@
+
+rebase : src/other/rebase.o
+ $(CXX) $(LDFLAGS) -Wl,-exported_symbol,__mh_execute_header $^ -o $@
+
+unwinddump : src/other/unwinddump.o
+ $(CXX) $(LDFLAGS) -Wl,-exported_symbol,__mh_execute_header $^ -o $@
+
+libprunetrie.a : src/other/PruneTrie.o
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+install : all
+ install -d -m 755 $(DESTDIR)$(PREFIX)/bin
+ install -d -m 755 $(DESTDIR)$(PREFIX)/lib
+ install -d -m 755 $(DESTDIR)$(PREFIX)/share/man/man1
+
+ install -m 755 ObjectDump $(DESTDIR)$(PREFIX)/bin
+ install -m 755 dyldinfo $(DESTDIR)$(PREFIX)/bin
+ install -m 755 ld $(DESTDIR)$(PREFIX)/bin
+ install -m 755 machocheck $(DESTDIR)$(PREFIX)/bin
+ install -m 755 rebase $(DESTDIR)$(PREFIX)/bin
+ install -m 755 unwinddump $(DESTDIR)$(PREFIX)/bin
+
+ install -m 644 libprunetrie.a $(DESTDIR)$(PREFIX)/lib
+
+ install -m 644 doc/man/man1/dyldinfo.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ install -m 644 doc/man/man1/ld.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ install -m 644 doc/man/man1/ld64.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ install -m 644 doc/man/man1/rebase.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ install -m 644 doc/man/man1/unwinddump.1 $(DESTDIR)$(PREFIX)/share/man/man1
+
Added: trunk/dports/devel/ld64/files/ld64-127-Makefile.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-127-Makefile.patch (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-127-Makefile.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -0,0 +1,11 @@
+--- Makefile
++++ Makefile
+@@ -54,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
+-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
+ $(CXX) $(LLVM_LDFLAGS) $(LDFLAGS) $(OTHER_LDFLAGS_LD64) -Wl,-exported_symbol,__mh_execute_header $^ -o $@
Deleted: trunk/dports/devel/ld64/files/ld64-85-no_pie.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-85-no_pie.patch 2012-04-28 20:07:43 UTC (rev 92439)
+++ trunk/dports/devel/ld64/files/ld64-85-no_pie.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -1,63 +0,0 @@
-diff -Naurp ld64-85.2.1.orig/doc/man/man1/ld.1 ld64-85.2.1/doc/man/man1/ld.1
---- doc/man/man1/ld.1 2008-03-04 17:53:18.000000000 -0800
-+++ doc/man/man1/ld.1 2012-04-26 10:24:00.000000000 -0700
-@@ -289,10 +289,12 @@ This option is also called -dylib_curren
- .Ss Options when creating a main executable
- .Bl -tag
- .It Fl pie
--This makes a special kind of main executable that is position independent (PIE). On Mac OS X 10.5, the OS
-+This makes a special kind of main executable that is position independent (PIE). On Mac OS X 10.5 and later, the OS
- will load a PIE at a random address each time it is executed. You cannot create a PIE from .o files compiled
- with -mdynamic-no-pic. That means the codegen is less optimal, but the address randomization adds some
- security.
-+.It Fl no_pie
-+Do not make a position independent executable (PIE). This is the default.
- .It Fl pagezero_size Ar size
- By default the linker creates an unreadable segment starting at address zero named __PAGEZERO. Its existence
- will cause a bus error if a NULL pointer is dereferenced. The argument
-diff -Naurp ld64-85.2.1.orig/src/Options.cpp ld64-85.2.1/src/Options.cpp
---- src/Options.cpp 2012-04-26 10:23:14.000000000 -0700
-+++ src/Options.cpp 2012-04-26 10:38:20.000000000 -0700
-@@ -95,7 +95,8 @@ Options::Options(int argc, const char* a
- fVerbose(false), fKeepRelocations(false), fWarnStabs(false),
- fTraceDylibSearching(false), fPause(false), fStatistics(false), fPrintOptions(false),
- fSharedRegionEligible(false), fPrintOrderFileStatistics(false),
-- fReadOnlyx86Stubs(false), fPositionIndependentExecutable(false), fMaxMinimumHeaderPad(false),
-+ fReadOnlyx86Stubs(false), fPositionIndependentExecutable(false),
-+ fDisablePositionIndependentExecutable(false), fMaxMinimumHeaderPad(false),
- fDeadStripDylibs(false), fAllowTextRelocs(false), fWarnTextRelocs(false),
- fUsingLazyDylibLinking(false), fEncryptable(true), fSaveTempFiles(false)
- {
-@@ -2286,6 +2287,9 @@ void Options::parse(int argc, const char
- else if ( strcmp(arg, "-pie") == 0 ) {
- fPositionIndependentExecutable = true;
- }
-+ else if ( strcmp(arg, "-no_pie") == 0 ) {
-+ fDisablePositionIndependentExecutable = true;
-+ }
- else if ( strncmp(arg, "-reexport-l", 11) == 0 ) {
- FileInfo info = findLibrary(&arg[11], true);
- info.options.fReExport = true;
-@@ -3050,7 +3059,11 @@ void Options::checkIllegalOptionCombinat
- }
- }
-
-+ // -no_pie anywhere on command line disable PIE
-+ if ( fDisablePositionIndependentExecutable )
-+ fPositionIndependentExecutable = false;
-+
- // check -pie is only used when building a dynamic main executable for 10.5
- if ( fPositionIndependentExecutable ) {
- if ( fOutputKind != Options::kDynamicExecutable )
- throw "-pie can only be used when linking a main executable";
-diff -Naurp ld64-85.2.1.orig/src/Options.h ld64-85.2.1/src/Options.h
---- src/Options.h 2008-07-10 18:15:14.000000000 -0700
-+++ src/Options.h 2012-04-26 10:24:46.000000000 -0700
-@@ -341,6 +341,7 @@ private:
- bool fPrintOrderFileStatistics;
- bool fReadOnlyx86Stubs;
- bool fPositionIndependentExecutable;
-+ bool fDisablePositionIndependentExecutable;
- bool fMaxMinimumHeaderPad;
- bool fDeadStripDylibs;
- bool fAllowTextRelocs;
Deleted: trunk/dports/devel/ld64/files/ld64-85-pbxproj.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-85-pbxproj.patch 2012-04-28 20:07:43 UTC (rev 92439)
+++ trunk/dports/devel/ld64/files/ld64-85-pbxproj.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -1,107 +0,0 @@
---- ld64.xcodeproj/project.pbxproj.orig 2008-04-29 16:26:12.000000000 -0700
-+++ ld64.xcodeproj/project.pbxproj 2012-04-22 12:29:31.000000000 -0700
-@@ -350,7 +350,7 @@
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/bash;
-- shellScript = "if [ -f /Developer/usr/local/include/llvm-c/lto.h ]; then\n\techo \"#define LTO_SUPPORT 1\" > ${DERIVED_FILE_DIR}/configure.h\nelse\n\techo \"#undef LTO_SUPPORT\t\" > ${DERIVED_FILE_DIR}/configure.h\nfi\n";
-+ shellScript = "if [ -f MACPORTS_LLVM_INCLUDEDIR/llvm-c/lto.h ]; then\n\techo \"#define LTO_SUPPORT 1\" > ${DERIVED_FILE_DIR}/configure.h\nelse\n\techo \"#undef LTO_SUPPORT\t\" > ${DERIVED_FILE_DIR}/configure.h\nfi\n";
- showEnvVarsInLog = 0;
- };
- F96D5367094A2754008E9EE8 /* ShellScript */ = {
-@@ -497,8 +497,9 @@
- );
- INSTALL_PATH = /usr/bin;
- MACOSX_DEPLOYMENT_TARGET = "";
-- OTHER_CPLUSPLUSFLAGS = "$(OTHER_CPLUSPLUSFLAGS)";
-- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
-+ OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib MACPORTS_LD64_LDFLAGS";
- PREBINDING = NO;
- PRODUCT_NAME = ld;
- SECTORDER_FLAGS = "";
-@@ -547,8 +548,9 @@
- "$(DEVELOPER_DIR)/usr/include",
- );
- INSTALL_PATH = /usr/bin;
-- OTHER_CPLUSPLUSFLAGS = "$(OTHER_CPLUSPLUSFLAGS)";
-- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
-+ OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib MACPORTS_LD64_LDFLAGS";
- PREBINDING = NO;
- PRODUCT_NAME = ld;
- SECTORDER_FLAGS = "";
-@@ -568,6 +570,8 @@
- GCC_OPTIMIZATION_LEVEL = 0;
- HEADER_SEARCH_PATHS = "$(DEVELOPER_DIR)/usr/include";
- INSTALL_PATH = "$(HOME)/bin";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
-@@ -590,6 +594,8 @@
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = s;
- INSTALL_PATH = "$(HOME)/bin";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
-@@ -607,6 +613,8 @@
- buildSettings = {
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- };
- name = Debug;
- };
-@@ -616,6 +624,8 @@
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- HEADER_SEARCH_PATHS = "$(DEVELOPER_DIR)/SDKs/Extra/usr/include";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- };
- name = Release;
- };
-@@ -667,6 +677,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = machocheck;
-@@ -680,6 +692,8 @@
- DEBUG_INFORMATION_FORMAT = dwarf;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = machocheck;
-@@ -695,6 +709,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = rebase;
-@@ -709,6 +725,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS_$(RC_RELEASE))";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = /usr/bin;
- PREBINDING = NO;
- PRODUCT_NAME = rebase;
Deleted: trunk/dports/devel/ld64/files/ld64-85-version.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-85-version.patch 2012-04-28 20:07:43 UTC (rev 92439)
+++ trunk/dports/devel/ld64/files/ld64-85-version.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -1,19 +0,0 @@
---- src/Options.cpp 2008-03-20 18:48:04.000000000 -0700
-+++ src/Options.cpp 2012-04-11 15:54:34.000000000 -0700
-@@ -32,6 +32,8 @@
-
- #include "Options.h"
-
-+const char *ldVersionString = "@(#)PROGRAM:ld PROJECT:ld64-@@VERSION@@\n";
-+
- void throwf(const char* format, ...)
- {
- va_list list;
-@@ -2153,7 +2155,6 @@ void Options::buildSearchPaths(int argc,
- addStandardLibraryDirectories = false;
- else if ( strcmp(argv[i], "-v") == 0 ) {
- fVerbose = true;
-- extern const char ldVersionString[];
- fprintf(stderr, "%s", ldVersionString);
- // if only -v specified, exit cleanly
- if ( argc == 2 )
Added: trunk/dports/devel/ld64/files/ld64-97-Makefile.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-97-Makefile.patch (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-97-Makefile.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -0,0 +1,48 @@
+--- Makefile
++++ Makefile
+@@ -3,7 +3,7 @@ LLVM_CPPFLAGS := -I$(shell $(LLVM_CONFIG) --includedir) -DLTO_SUPPORT
+ LLVM_LDFLAGS := -L$(shell $(LLVM_CONFIG) --libdir) -lLTO
+ 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)
+ LDFLAGS = $(OTHER_LDFLAGS)
+@@ -26,8 +26,6 @@ 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
+
+ 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/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 $@
+
+ machocheck : src/other/machochecker.o
Added: trunk/dports/devel/ld64/files/ld64-97-no-LTO.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-97-no-LTO.patch (rev 0)
+++ trunk/dports/devel/ld64/files/ld64-97-no-LTO.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -0,0 +1,27 @@
+--- src/ld/ld.cpp.orig 2012-04-21 16:07:59.000000000 -0700
++++ src/ld/ld.cpp 2012-04-21 16:08:44.000000000 -0700
+@@ -3206,11 +3206,11 @@ const char* Linker::fileArch(const void*
+ result = mach_o::relocatable::Reader<arm>::fileKind(bytes);
+ if ( result != NULL )
+ return result;
+-
++#if LTO_SUPPORT
+ result = lto::Reader::fileKind(bytes);
+ if ( result != NULL )
+ return result;
+-
++#endif
+ return "unsupported file format";
+ }
+
+--- src/other/ObjectDump.cpp.orig 2012-04-28 11:18:03.000000000 -0700
++++ src/other/ObjectDump.cpp 2012-04-28 11:22:00.000000000 -0700
+@@ -30,8 +30,6 @@
+
+ #include "MachOReaderRelocatable.hpp"
+
+-#define LTO_SUPPORT 1
+-
+ #if LTO_SUPPORT
+ #include "LTOReader.hpp"
+ #endif
Deleted: trunk/dports/devel/ld64/files/ld64-pbxproj.patch
===================================================================
--- trunk/dports/devel/ld64/files/ld64-pbxproj.patch 2012-04-28 20:07:43 UTC (rev 92439)
+++ trunk/dports/devel/ld64/files/ld64-pbxproj.patch 2012-04-28 20:39:35 UTC (rev 92440)
@@ -1,213 +0,0 @@
---- ld64.xcodeproj/project.pbxproj.orig 2012-01-03 14:27:16.000000000 -0800
-+++ ld64.xcodeproj/project.pbxproj 2012-04-22 12:52:05.000000000 -0700
-@@ -909,8 +909,9 @@
- INSTALL_PATH = /usr/bin;
- LINKER_DISPLAYS_MANGLED_NAMES = NO;
- MACOSX_DEPLOYMENT_TARGET = "";
-- OTHER_CPLUSPLUSFLAGS = "$(OTHER_CPLUSPLUSFLAGS)";
-- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
-+ OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib MACPORTS_LD64_LDFLAGS";
- PREBINDING = NO;
- PRODUCT_NAME = ld;
- SECTORDER_FLAGS = "";
-@@ -966,10 +967,12 @@
- "$(DEVELOPER_DIR)/usr/include",
- );
- INSTALL_PATH = /usr/bin;
-- OTHER_CPLUSPLUSFLAGS = "$(OTHER_CPLUSPLUSFLAGS)";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = (
- "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib",
- "-Wl,-exported_symbol,__mh_execute_header",
-+ "MACPORTS_LD64_LDFLAGS",
- );
- PREBINDING = NO;
- PRODUCT_NAME = ld;
-@@ -1006,6 +1009,8 @@
- "$(DEVELOPER_DIR)/usr/local/include",
- );
- INSTALL_PATH = "$(HOME)/bin";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
-@@ -1033,6 +1038,8 @@
- "$(DEVELOPER_DIR)/usr/local/include",
- );
- INSTALL_PATH = "$(HOME)/bin";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
-@@ -1050,6 +1057,8 @@
- buildSettings = {
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- };
- name = Debug;
- };
-@@ -1144,10 +1153,12 @@
- "$(DEVELOPER_DIR)/usr/include",
- );
- INSTALL_PATH = /usr/bin;
-- OTHER_CPLUSPLUSFLAGS = "$(OTHER_CPLUSPLUSFLAGS)";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = (
- "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib",
- "-Wl,-exported_symbol,__mh_execute_header",
-+ "MACPORTS_LD64_LDFLAGS",
- );
- PREBINDING = NO;
- PRODUCT_NAME = ld;
-@@ -1170,6 +1181,8 @@
- GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS_$(RC_RELEASE))";
- HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = /usr/bin;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-exported_symbol,__mh_execute_header";
- PREBINDING = NO;
- PRODUCT_NAME = rebase;
-@@ -1190,6 +1203,8 @@
- GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = /usr/bin;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-exported_symbol,__mh_execute_header";
- PREBINDING = NO;
- PRODUCT_NAME = unwinddump;
-@@ -1213,6 +1228,8 @@
- "$(DEVELOPER_DIR)/usr/local/include",
- );
- INSTALL_PATH = "$(HOME)/bin";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-lazy_library,/Developer/usr/lib/libLTO.dylib";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
-@@ -1233,6 +1250,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = machocheck;
-@@ -1248,6 +1267,8 @@
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G5;
- INSTALL_PATH = /usr/bin;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-exported_symbol,__mh_execute_header";
- PREBINDING = NO;
- PRODUCT_NAME = dyldinfo;
-@@ -1266,6 +1287,8 @@
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G5;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
- PRODUCT_NAME = prunetrie;
-@@ -1291,6 +1314,8 @@
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
- PRODUCT_NAME = prunetrie;
-@@ -1306,6 +1331,8 @@
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G5;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
- PRODUCT_NAME = prunetrie;
-@@ -1344,6 +1371,8 @@
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
- GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = unwinddump;
-@@ -1361,6 +1390,8 @@
- GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = /usr/bin;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-exported_symbol,__mh_execute_header";
- PREBINDING = NO;
- PRODUCT_NAME = unwinddump;
-@@ -1388,6 +1419,8 @@
- GCC_WARN_UNUSED_LABEL = NO;
- GCC_WARN_UNUSED_VALUE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
- PRODUCT_NAME = dyldinfo;
-@@ -1404,6 +1437,8 @@
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G5;
- INSTALL_PATH = /usr/bin;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-exported_symbol,__mh_execute_header";
- PREBINDING = NO;
- PRODUCT_NAME = dyldinfo;
-@@ -1421,6 +1456,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = machocheck;
-@@ -1435,6 +1472,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- HEADER_SEARCH_PATHS = "";
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = machocheck;
-@@ -1450,6 +1489,8 @@
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- INSTALL_PATH = "$(HOME)/bin";
- PREBINDING = NO;
- PRODUCT_NAME = rebase;
-@@ -1466,6 +1507,8 @@
- GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS_$(RC_RELEASE))";
- HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = /usr/bin;
-+ OTHER_CFLAGS = "MACPORTS_CFLAGS";
-+ OTHER_CPLUSPLUSFLAGS = "MACPORTS_CPLUSPLUSFLAGS";
- OTHER_LDFLAGS = "-Wl,-exported_symbol,__mh_execute_header";
- PREBINDING = NO;
- PRODUCT_NAME = rebase;
Deleted: trunk/dports/devel/ld64/files/patch-MATH85-ld.cpp.diff
===================================================================
--- trunk/dports/devel/ld64/files/patch-MATH85-ld.cpp.diff 2012-04-28 20:07:43 UTC (rev 92439)
+++ trunk/dports/devel/ld64/files/patch-MATH85-ld.cpp.diff 2012-04-28 20:39:35 UTC (rev 92440)
@@ -1,13 +0,0 @@
---- src/ld.cpp 2010-01-26 20:07:02.000000000 +0100
-+++ src/ld.cpp 2010-10-12 22:56:13.000000000 +0200
-@@ -21,10 +21,6 @@
- * @APPLE_LICENSE_HEADER_END@
- */
-
--// start temp HACK for cross builds
--extern "C" double log2 ( double );
--#define __MATH__
--// end temp HACK for cross builds
-
-
- #include <stdlib.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120428/c34edf2d/attachment-0001.html>
More information about the macports-changes
mailing list