Revision: 145331 https://trac.macports.org/changeset/145331 Author: jeremyhu@macports.org Date: 2016-02-01 15:43:34 -0800 (Mon, 01 Feb 2016) Log Message: ----------- llvm-3.9: Bump to r259341 Revision Links: -------------- https://trac.macports.org/changeset/259341 Modified Paths: -------------- trunk/dports/lang/llvm-3.9/Portfile trunk/dports/lang/llvm-3.9/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch trunk/dports/lang/llvm-3.9/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch Added Paths: ----------- trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch trunk/dports/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch trunk/dports/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch trunk/dports/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch Removed Paths: ------------- trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch trunk/dports/lang/llvm-3.9/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch trunk/dports/lang/llvm-3.9/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch trunk/dports/lang/llvm-3.9/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch trunk/dports/lang/llvm-3.9/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch trunk/dports/lang/llvm-3.9/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch trunk/dports/lang/llvm-3.9/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch trunk/dports/lang/llvm-3.9/files/1005-Default-to-ppc7400-for-OSX-10.5.patch trunk/dports/lang/llvm-3.9/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch trunk/dports/lang/llvm-3.9/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch trunk/dports/lang/llvm-3.9/files/llvm-skip-unittests.patch Modified: trunk/dports/lang/llvm-3.9/Portfile =================================================================== --- trunk/dports/lang/llvm-3.9/Portfile 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/Portfile 2016-02-01 23:43:34 UTC (rev 145331) @@ -69,7 +69,7 @@ } fetch.type svn -svn.revision 257997 +svn.revision 259341 set compiler_rt_rev ${svn.revision} set libcxx_rev ${svn.revision} @@ -105,22 +105,16 @@ patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ - 0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \ - 0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \ - 0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \ - 0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch \ - 0007-Remove-override-of-raise-abort-and-__assert_rtn.patch \ - llvm-skip-unittests.patch + 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \ + 0004-Remove-override-of-raise-abort-and-__assert_rtn.patch if {${subport} eq "clang-${llvm_version}"} { patchfiles-append \ 1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \ - 1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \ - 1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \ - 1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \ - 1005-Default-to-ppc7400-for-OSX-10.5.patch \ - 1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \ - 1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \ + 1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \ + 1003-Default-to-ppc7400-for-OSX-10.5.patch \ + 1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \ + 1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \ 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \ 2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \ 2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \ @@ -135,11 +129,6 @@ 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \ compiler_rt-toolchain.patch - # I'm not sure if we need to delete this. It seems to build fine with it - # present, but we used to explicitly only use this patch for the llvm subport. - patchfiles-delete \ - 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch - # https://llvm.org/bugs/show_bug.cgi?id=25681 if {${worksrcdir} eq "trunk" || ${worksrcdir} eq "release_${llvm_version_no_dot}"} { # Cannot set cppflags due to https://cmake.org/Bug/view.php?id=12928 Modified: trunk/dports/lang/llvm-3.9/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,7 +1,7 @@ -From 6bba00c71e59ac9cd2db1e630fe4a94b7451a220 Mon Sep 17 00:00:00 2001 +From 7c7ac9a92497d52494a841bd1bcf6df07b0f4d13 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sat, 17 Jan 2015 09:03:43 -0800 -Subject: [PATCH 1/7] Set the Mach-O CPU Subtype to ppc7400 when targeting +Subject: [PATCH 1/4] Set the Mach-O CPU Subtype to ppc7400 when targeting Leopard http://llvm.org/bugs/show_bug.cgi?id=18463 @@ -11,10 +11,10 @@ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -diff --git llvm_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp +diff --git llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp index b6dd595..11a7953 100644 ---- llvm_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp -+++ macports_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp +--- llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp ++++ macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp @@ -201,16 +201,23 @@ public: // FIXME: This should be in a separate file. namespace { Modified: trunk/dports/lang/llvm-3.9/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,7 +1,7 @@ -From 1c7867cfc6dd0ebf1450001d634a7e7e0a313e6a Mon Sep 17 00:00:00 2001 +From 8600795c2b9d37dc8eb8aa18dc38e7abe8767a36 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sun, 18 Jan 2015 11:18:13 -0800 -Subject: [PATCH 2/7] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're +Subject: [PATCH 2/4] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're not defined in the SDK The 10.4 SDK does not define these macros @@ -11,10 +11,10 @@ lib/Support/Unix/Signals.inc | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git llvm_release_38/lib/Support/Unix/Signals.inc macports_release_38/lib/Support/Unix/Signals.inc +diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc index 061cdb3..4d687b3 100644 ---- llvm_release_38/lib/Support/Unix/Signals.inc -+++ macports_release_38/lib/Support/Unix/Signals.inc +--- llvm_master/lib/Support/Unix/Signals.inc ++++ macports_master/lib/Support/Unix/Signals.inc @@ -387,6 +387,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) { AddSignalHandler(PrintStackTraceSignalHandler, nullptr); Added: trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,29 @@ +From f37d1e0f822b626119ca4b8873bf54418734e75a Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 17 Jan 2015 16:41:30 -0800 +Subject: [PATCH 3/4] MacPorts Only: Don't embed the deployment target in the + asm when using -fno-integrated-as + +http://llvm.org/bugs/show_bug.cgi?id=21636 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +index 4d945bd..5cbf88c 100644 +--- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp ++++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +@@ -193,7 +193,7 @@ bool AsmPrinter::doInitialization(Module &M) { + // anyway. + Triple TT(getTargetTriple()); + // If there is a version specified, Major will be non-zero. +- if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0) { ++ if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0 && MAI->useIntegratedAssembler()) { + unsigned Major, Minor, Update; + MCVersionMinType VersionType; + if (TT.isWatchOS()) { +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,31 +0,0 @@ -From 6719d80f133381ed543e73ef853ab326e0445657 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 16:33:09 -0800 -Subject: [PATCH 3/7] MacPorts Only: Update install targets for clang subport - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git llvm_release_38/Makefile macports_release_38/Makefile -index 2b9468a..19fbfdc 100644 ---- llvm_release_38/Makefile -+++ macports_release_38/Makefile -@@ -70,9 +70,11 @@ ifeq ($(MAKECMDGOALS),install-clang) - DIRS := tools/clang/tools/driver tools/clang/lib/Headers \ - tools/clang/tools/libclang \ - tools/clang/tools/c-index-test \ -- tools/clang/include/clang-c \ - tools/clang/runtime tools/clang/docs \ -- tools/lto -+ tools/clang/include tools/clang/lib \ -+ tools/clang/tools/clang-format \ -+ tools/clang/tools/extra/clang-modernize \ -+ tools/clang/tools/extra/clang-apply-replacements - OPTIONAL_DIRS := - NO_INSTALL = 1 - endif --- -2.7.0 - Deleted: trunk/dports/lang/llvm-3.9/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,32 +0,0 @@ -From 23339e9b32d7456ec6a964f9cda01dac78f1128d Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 16:34:41 -0800 -Subject: [PATCH 4/7] MacPorts Only: Use full path for the dylib id instead of - @rpath - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - Makefile.rules | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git llvm_release_38/Makefile.rules macports_release_38/Makefile.rules -index a67aef7..def94c0 100644 ---- llvm_release_38/Makefile.rules -+++ macports_release_38/Makefile.rules -@@ -600,7 +600,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS),Darwin) - LD.Flags += $(RPATH) -Wl,'$$ORIGIN' - else -- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)" -+ LD.Flags += -Wl,-install_name -+ ifdef LOADABLE_MODULE -+ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)" -+ else -+ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)" -+ endif - endif - endif - endif --- -2.7.0 - Added: trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,62 @@ +From 744b351ef28eff3ea4fb1c40e81e8f8e1c034d79 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 16 Jan 2016 10:19:07 -0800 +Subject: [PATCH 4/4] Remove override of raise(), abort(), and __assert_rtn() + +Lion (10.7) and newer versions of OS X implement abort() using pthread_kill(). + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + lib/Support/Unix/Signals.inc | 39 --------------------------------------- + 1 file changed, 39 deletions(-) + +diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc +index 4d687b3..f2797a0 100644 +--- llvm_master/lib/Support/Unix/Signals.inc ++++ macports_master/lib/Support/Unix/Signals.inc +@@ -411,42 +411,3 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) { + } + #endif + } +- +- +-/***/ +- +-// On Darwin, raise sends a signal to the main thread instead of the current +-// thread. This has the unfortunate effect that assert() and abort() will end up +-// bypassing our crash recovery attempts. We work around this for anything in +-// the same linkage unit by just defining our own versions of the assert handler +-// and abort. +- +-#if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES) +- +-#include <signal.h> +-#include <pthread.h> +- +-int raise(int sig) { +- return pthread_kill(pthread_self(), sig); +-} +- +-void __assert_rtn(const char *func, +- const char *file, +- int line, +- const char *expr) { +- if (func) +- fprintf(stderr, "Assertion failed: (%s), function %s, file %s, line %d.\n", +- expr, func, file, line); +- else +- fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n", +- expr, file, line); +- abort(); +-} +- +-void abort() { +- raise(SIGABRT); +- usleep(1000); +- __builtin_trap(); +-} +- +-#endif +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,29 +0,0 @@ -From 25522bcea0e4f092f32ed4ab05d34d37618623a8 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 16:41:30 -0800 -Subject: [PATCH 5/7] MacPorts Only: Don't embed the deployment target in the - asm when using -fno-integrated-as - -http://llvm.org/bugs/show_bug.cgi?id=21636 - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git llvm_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp -index 5f67d3d..8824bd3 100644 ---- llvm_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp -+++ macports_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp -@@ -193,7 +193,7 @@ bool AsmPrinter::doInitialization(Module &M) { - // anyway. - Triple TT(getTargetTriple()); - // If there is a version specified, Major will be non-zero. -- if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0) { -+ if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0 && MAI->useIntegratedAssembler()) { - unsigned Major, Minor, Update; - MCVersionMinType VersionType; - if (TT.isWatchOS()) { --- -2.7.0 - Deleted: trunk/dports/lang/llvm-3.9/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,111 +0,0 @@ -From bda46b8c958c6ad05fdfdb8baed181ac3d4a138f Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 16:43:00 -0800 -Subject: [PATCH 6/7] MacPorts Only: Skip checking for python in configure - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - configure | 87 --------------------------------------------------------------- - 1 file changed, 87 deletions(-) - -diff --git llvm_release_38/configure macports_release_38/configure -index c94fb13..0d01ba1 100755 ---- llvm_release_38/configure -+++ macports_release_38/configure -@@ -8483,93 +8483,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags" - echo "${ECHO_T}$NO_VARIADIC_MACROS $MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&6; } - - --# Check whether --with-python was given. --if test "${with_python+set}" = set; then -- withval=$with_python; PYTHON="$withval" --fi -- -- --if test -n "$PYTHON" && test -x "$PYTHON" ; then -- { echo "$as_me:$LINENO: checking for python" >&5 --echo $ECHO_N "checking for python... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5 --echo "${ECHO_T}user defined: $with_python" >&6; } --else -- if test -n "$PYTHON" ; then -- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5 --echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;} -- fi -- -- # Extract the first word of "python python2 python27", so it can be a program name with args. --set dummy python python2 python27; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } --if test "${ac_cv_path_PYTHON+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $PYTHON in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6; } -- { { echo "$as_me:$LINENO: error: could not find python 2.7 or higher" >&5 --echo "$as_me: error: could not find python 2.7 or higher" >&2;} -- { (exit 1); exit 1; }; }" -- ;; --esac --fi --PYTHON=$ac_cv_path_PYTHON --if test -n "$PYTHON"; then -- { echo "$as_me:$LINENO: result: $PYTHON" >&5 --echo "${ECHO_T}$PYTHON" >&6; } --else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi -- -- --fi -- --{ echo "$as_me:$LINENO: checking for python >= 2.7" >&5 --echo $ECHO_N "checking for python >= 2.7... $ECHO_C" >&6; } --ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2` --ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1` --ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2` --ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3` --if test "$ac_python_version_major" -gt "2" || \ -- (test "$ac_python_version_major" -eq "2" && \ -- test "$ac_python_version_minor" -ge "7") ; then -- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5 --echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; } --else -- { echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6; } -- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.7 --See \`config.log' for more details." >&5 --echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- -- -- - { echo "$as_me:$LINENO: checking for sin in -lm" >&5 - echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; } - if test "${ac_cv_lib_m_sin+set}" = set; then --- -2.7.0 - Deleted: trunk/dports/lang/llvm-3.9/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,62 +0,0 @@ -From 51958b26c17d9d51ca5f7bb1ee52af34ef5f444b Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 16 Jan 2016 10:19:07 -0800 -Subject: [PATCH 7/7] Remove override of raise(), abort(), and __assert_rtn() - -Lion (10.7) and newer versions of OS X implement abort() using pthread_kill(). - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - lib/Support/Unix/Signals.inc | 39 --------------------------------------- - 1 file changed, 39 deletions(-) - -diff --git llvm_release_38/lib/Support/Unix/Signals.inc macports_release_38/lib/Support/Unix/Signals.inc -index 4d687b3..f2797a0 100644 ---- llvm_release_38/lib/Support/Unix/Signals.inc -+++ macports_release_38/lib/Support/Unix/Signals.inc -@@ -411,42 +411,3 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) { - } - #endif - } -- -- --/***/ -- --// On Darwin, raise sends a signal to the main thread instead of the current --// thread. This has the unfortunate effect that assert() and abort() will end up --// bypassing our crash recovery attempts. We work around this for anything in --// the same linkage unit by just defining our own versions of the assert handler --// and abort. -- --#if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES) -- --#include <signal.h> --#include <pthread.h> -- --int raise(int sig) { -- return pthread_kill(pthread_self(), sig); --} -- --void __assert_rtn(const char *func, -- const char *file, -- int line, -- const char *expr) { -- if (func) -- fprintf(stderr, "Assertion failed: (%s), function %s, file %s, line %d.\n", -- expr, func, file, line); -- else -- fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n", -- expr, file, line); -- abort(); --} -- --void abort() { -- raise(SIGABRT); -- usleep(1000); -- __builtin_trap(); --} -- --#endif --- -2.7.0 - Deleted: trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,84 +0,0 @@ -From 7dbc94035eaddc6140e9d868bca254288e101078 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 17:50:24 -0800 -Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement - with absolute path - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - tools/clang-format/clang-format-bbedit.applescript | 2 +- - tools/clang-format/clang-format-diff.py | 2 +- - tools/clang-format/clang-format-sublime.py | 2 +- - tools/clang-format/clang-format.el | 3 +-- - tools/clang-format/clang-format.py | 2 +- - 5 files changed, 5 insertions(+), 6 deletions(-) - -diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript -index fa88fe9..eb09448 100644 ---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript -+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript -@@ -15,7 +15,7 @@ tell application "BBEdit" - end tell - - set filePath to urlToPOSIXPath(fileURL) --set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath -+set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath - - tell application "BBEdit" - -- "set contents of text document 1 to newContents" scrolls to the bottom while -diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py -index 9e02bb0..b62bef3 100755 ---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py -+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py -@@ -32,7 +32,7 @@ import sys - - - # Change this to the full path if clang-format is not on the path. --binary = 'clang-format' -+binary = '@CLANG_FORMAT_PATH@' - - - def main(): -diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py -index 16ff56e..4b68104 100644 ---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py -+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py -@@ -18,7 +18,7 @@ import sublime_plugin - import subprocess - - # Change this to the full path if clang-format is not on the path. --binary = 'clang-format' -+binary = '@CLANG_FORMAT_PATH@' - - # Change this to format according to other formatting styles. See the output of - # 'clang-format --help' for a list of supported styles. The default looks for -diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el -index ca46144..1c49835 100644 ---- llvm_master/tools/clang/tools/clang-format/clang-format.el -+++ macports_master/tools/clang/tools/clang-format/clang-format.el -@@ -36,8 +36,7 @@ - :group 'tools) - - (defcustom clang-format-executable -- (or (executable-find "clang-format") -- "clang-format") -+ "@CLANG_FORMAT_PATH@" - "Location of the clang-format executable. - - A string containing the name or the full path of the executable." -diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py -index 5cb41fc..e8a5904 100644 ---- llvm_master/tools/clang/tools/clang-format/clang-format.py -+++ macports_master/tools/clang/tools/clang-format/clang-format.py -@@ -34,7 +34,7 @@ import vim - - # set g:clang_format_path to the path to clang-format if it is not on the path - # Change this to the full path if clang-format is not on the path. --binary = 'clang-format' -+binary = '@CLANG_FORMAT_PATH@' - if vim.eval('exists("g:clang_format_path")') == "1": - binary = vim.eval('g:clang_format_path') - --- -2.6.2 - Added: trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,84 @@ +From ab5dbc40e2dc4220e0ba1e88a106266e9ba10f8b Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 17 Jan 2015 17:50:24 -0800 +Subject: [PATCH 1001/1005] MacPorts Only: Prepare clang-format for replacement + with absolute path + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + tools/clang-format/clang-format-bbedit.applescript | 2 +- + tools/clang-format/clang-format-diff.py | 2 +- + tools/clang-format/clang-format-sublime.py | 2 +- + tools/clang-format/clang-format.el | 3 +-- + tools/clang-format/clang-format.py | 2 +- + 5 files changed, 5 insertions(+), 6 deletions(-) + +diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript +index fa88fe9..eb09448 100644 +--- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript ++++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript +@@ -15,7 +15,7 @@ tell application "BBEdit" + end tell + + set filePath to urlToPOSIXPath(fileURL) +-set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath ++set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath + + tell application "BBEdit" + -- "set contents of text document 1 to newContents" scrolls to the bottom while +diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py +index 5e728f5..b23c3c8 100755 +--- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py ++++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py +@@ -55,7 +55,7 @@ def main(): + parser.add_argument('-style', + help='formatting style to apply (LLVM, Google, Chromium, ' + 'Mozilla, WebKit)') +- parser.add_argument('-binary', default='clang-format', ++ parser.add_argument('-binary', default='@CLANG_FORMAT_PATH@', + help='location of binary to use for clang-format') + args = parser.parse_args() + +diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py +index 16ff56e..4b68104 100644 +--- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py ++++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py +@@ -18,7 +18,7 @@ import sublime_plugin + import subprocess + + # Change this to the full path if clang-format is not on the path. +-binary = 'clang-format' ++binary = '@CLANG_FORMAT_PATH@' + + # Change this to format according to other formatting styles. See the output of + # 'clang-format --help' for a list of supported styles. The default looks for +diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el +index ca46144..1c49835 100644 +--- llvm_master/tools/clang/tools/clang-format/clang-format.el ++++ macports_master/tools/clang/tools/clang-format/clang-format.el +@@ -36,8 +36,7 @@ + :group 'tools) + + (defcustom clang-format-executable +- (or (executable-find "clang-format") +- "clang-format") ++ "@CLANG_FORMAT_PATH@" + "Location of the clang-format executable. + + A string containing the name or the full path of the executable." +diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py +index 5cb41fc..e8a5904 100644 +--- llvm_master/tools/clang/tools/clang-format/clang-format.py ++++ macports_master/tools/clang/tools/clang-format/clang-format.py +@@ -34,7 +34,7 @@ import vim + + # set g:clang_format_path to the path to clang-format if it is not on the path + # Change this to the full path if clang-format is not on the path. +-binary = 'clang-format' ++binary = '@CLANG_FORMAT_PATH@' + if vim.eval('exists("g:clang_format_path")') == "1": + binary = vim.eval('g:clang_format_path') + +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,39 +0,0 @@ -From 6327a2a1206a17c82391beb82a528e685b2d7cac Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 17:51:10 -0800 -Subject: [PATCH 1002/1007] MacPorts Only: Fall back on xcodebuild -sdk when - xcrun --sdk is not supported - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - runtime/compiler-rt/Makefile | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile -index 55642a6..b6106d1 100644 ---- llvm_master/tools/clang/runtime/compiler-rt/Makefile -+++ macports_master/tools/clang/runtime/compiler-rt/Makefile -@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \ - profile_osx.a \ - ubsan_osx_dynamic.dylib - --IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null) --IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null) -+XCRunSdkPath = \ -+ $(shell \ -+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \ -+ if [ "$$?" != "0" ]; then \ -+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \ -+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \ -+ fi; \ -+ if [ "$$?" != "0" ]; then result=""; fi; \ -+ echo $$result) -+ -+IOS_SDK := $(call XCRunSdkPath,iphoneos) -+IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator) - - ifneq ($(IOS_SDK)$(IOSSIM_SDK),) - RuntimeLibrary.darwin.Configs += ios.a profile_ios.a --- -2.6.2 - Added: trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,29 @@ +From f251a1bd711d637013a19dddb23bc0e7ab6ef685 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 17 Jan 2015 17:55:27 -0800 +Subject: [PATCH 1002/1005] MacPorts Only: Fix name of scan-view executable + inside scan-build + +http://trac.macports.org/ticket/35006 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + tools/scan-build/bin/scan-build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build +index 6a14484..319305f 100755 +--- llvm_master/tools/clang/tools/scan-build/bin/scan-build ++++ macports_master/tools/clang/tools/scan-build/bin/scan-build +@@ -1817,6 +1817,8 @@ if (defined $Options{OutputFormat}) { + Diag "Analysis run complete.\n"; + Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n"; + my $ScanView = Cwd::realpath("$RealBin/scan-view"); ++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); } ++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); } + if (! -x $ScanView) { $ScanView = "scan-view"; } + if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); } + exec $ScanView, "$Options{OutputDir}"; +-- +2.7.0 + Added: trunk/dports/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,26 @@ +From 2bf8502dda4a3ec979b15644513b31c0547959b7 Mon Sep 17 00:00:00 2001 +From: Iain Sandoe <iain@codesourcery.com> +Date: Sun, 27 Jul 2014 20:35:16 +0100 +Subject: [PATCH 1003/1005] Default to ppc7400 for OSX 10.5+ + +--- + lib/Driver/Tools.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp +index 2819ab3..e7d5a0c 100644 +--- llvm_master/tools/clang/lib/Driver/Tools.cpp ++++ macports_master/tools/clang/lib/Driver/Tools.cpp +@@ -1751,6 +1751,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T, + TargetCPUName = "ppc64"; + else if (T.getArch() == llvm::Triple::ppc64le) + TargetCPUName = "ppc64le"; ++ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5)) ++ // For 10.5+ Altivec is assumed available. ++ TargetCPUName = "7400"; + else + TargetCPUName = "ppc"; + } +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,29 +0,0 @@ -From 2a763d1dca2bf4967aef146bf75f3fea72820b0d Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 17:55:27 -0800 -Subject: [PATCH 1003/1007] MacPorts Only: Fix name of scan-view executable - inside scan-build - -http://trac.macports.org/ticket/35006 - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - tools/scan-build/bin/scan-build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build -index 6a14484..319305f 100755 ---- llvm_master/tools/clang/tools/scan-build/bin/scan-build -+++ macports_master/tools/clang/tools/scan-build/bin/scan-build -@@ -1817,6 +1817,8 @@ if (defined $Options{OutputFormat}) { - Diag "Analysis run complete.\n"; - Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n"; - my $ScanView = Cwd::realpath("$RealBin/scan-view"); -+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); } -+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); } - if (! -x $ScanView) { $ScanView = "scan-view"; } - if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); } - exec $ScanView, "$Options{OutputDir}"; --- -2.6.2 - Deleted: trunk/dports/lang/llvm-3.9/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,74 +0,0 @@ -From 0584af98c60ffbf7f9495d5e917647407b3bcd5d Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 17:58:25 -0800 -Subject: [PATCH 1004/1007] MacPorts Only: Relocate clang resources using llvm - version - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - lib/Headers/Makefile | 3 ++- - runtime/compiler-rt/Makefile | 15 ++++++++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile -index 903acac..7c37992 100644 ---- llvm_master/tools/clang/lib/Headers/Makefile -+++ macports_master/tools/clang/lib/Headers/Makefile -@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile - - CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \ - $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc)) -+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) - - HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include - -@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di - # Hook into the standard Makefile rules. - all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap - --PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include -+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include - - INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS)) - INSTHEADERS += $(PROJ_headers)/arm_neon.h -diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile -index b6106d1..2ce50d9 100644 ---- llvm_master/tools/clang/runtime/compiler-rt/Makefile -+++ macports_master/tools/clang/runtime/compiler-rt/Makefile -@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile - - CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \ - $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc)) -+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) - - ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION) --PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION) -+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION) - - ResourceLibDir := $(ResourceDir)/lib - ResourceIncludeDir := $(ResourceDir)/include -@@ -259,9 +260,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso - RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer - .PHONY: RuntimeHeaderInstall - -+# Make sure $(PROJ_resources) exists before creating the symlink. -+$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)): -+ $(Echo) Creating compiler runtime compatibility symlink -+ $(Verb) $(MKDIR) $(dir $@) -+ $(Verb) ln -s $(LLVM_VERSION) $@ -+ -+MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)) -+.PHONY: MacPortsClangResSymlinkInstall -+ - # Hook into the standard Makefile rules. - all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader - install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall -+ifneq ($(LLVM_VERSION),$(CLANG_VERSION)) -+install-local:: MacPortsClangResSymlinkInstall -+endif - clean-local:: CleanRuntimeLibraries - - endif --- -2.6.2 - Added: trunk/dports/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,29 @@ +From b81b30b857fbd33e4788688e4a157b37b0538947 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 17 Jan 2015 19:08:57 -0800 +Subject: [PATCH 1004/1005] Only call setpriority(PRIO_DARWIN_THREAD, 0, + PRIO_DARWIN_BG) if it is available + +Tiger and earlier versions of darwin do not support this. + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + tools/libclang/CIndex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp +index b2a9ab8..98b50ce 100644 +--- llvm_master/tools/clang/tools/libclang/CIndex.cpp ++++ macports_master/tools/clang/tools/libclang/CIndex.cpp +@@ -7744,7 +7744,7 @@ void clang::setThreadBackgroundPriority() { + if (getenv("LIBCLANG_BGPRIO_DISABLE")) + return; + +-#ifdef USE_DARWIN_THREADS ++#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG) + setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG); + #endif + } +-- +2.7.0 + Added: trunk/dports/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,31 @@ +From e0bb397409adb1a6146dd5c1e044e0614070920e Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Tue, 20 Jan 2015 00:09:16 -0800 +Subject: [PATCH 1005/1005] Default to fragile ObjC runtime when targeting + darwin/ppc + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + lib/Driver/ToolChains.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h +index a5f5473..4f53d95 100644 +--- llvm_master/tools/clang/lib/Driver/ToolChains.h ++++ macports_master/tools/clang/lib/Driver/ToolChains.h +@@ -324,8 +324,10 @@ public: + bool IsEncodeExtendedBlockSignatureDefault() const override { return true; } + + bool IsObjCNonFragileABIDefault() const override { +- // Non-fragile ABI is default for everything but i386. +- return getTriple().getArch() != llvm::Triple::x86; ++ // Non-fragile ABI is default for legacy architectures ++ return getTriple().getArch() != llvm::Triple::x86 && ++ getTriple().getArch() != llvm::Triple::ppc && ++ getTriple().getArch() != llvm::Triple::ppc64; + } + + bool UseObjCMixedDispatch() const override { return true; } +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/1005-Default-to-ppc7400-for-OSX-10.5.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,26 +0,0 @@ -From f787fe18be52154ebf95db36df01192f2f779733 Mon Sep 17 00:00:00 2001 -From: Iain Sandoe <iain@codesourcery.com> -Date: Sun, 27 Jul 2014 20:35:16 +0100 -Subject: [PATCH 1005/1007] Default to ppc7400 for OSX 10.5+ - ---- - lib/Driver/Tools.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp -index 3bd2ffb..76cc5a0 100644 ---- llvm_master/tools/clang/lib/Driver/Tools.cpp -+++ macports_master/tools/clang/lib/Driver/Tools.cpp -@@ -1700,6 +1700,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T, - TargetCPUName = "ppc64"; - else if (T.getArch() == llvm::Triple::ppc64le) - TargetCPUName = "ppc64le"; -+ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5)) -+ // For 10.5+ Altivec is assumed available. -+ TargetCPUName = "7400"; - else - TargetCPUName = "ppc"; - } --- -2.6.2 - Deleted: trunk/dports/lang/llvm-3.9/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,29 +0,0 @@ -From dd396124cc450c06fb7a34df4184375a7785ef98 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 19:08:57 -0800 -Subject: [PATCH 1006/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0, - PRIO_DARWIN_BG) if it is available - -Tiger and earlier versions of darwin do not support this. - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - tools/libclang/CIndex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp -index 589e39e..c10ce43 100644 ---- llvm_master/tools/clang/tools/libclang/CIndex.cpp -+++ macports_master/tools/clang/tools/libclang/CIndex.cpp -@@ -7321,7 +7321,7 @@ void clang::setThreadBackgroundPriority() { - if (getenv("LIBCLANG_BGPRIO_DISABLE")) - return; - --#ifdef USE_DARWIN_THREADS -+#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG) - setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG); - #endif - } --- -2.6.2 - Deleted: trunk/dports/lang/llvm-3.9/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,31 +0,0 @@ -From 6ebfe70568d76cf4bb4c42cca2d22d66c04a310b Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Tue, 20 Jan 2015 00:09:16 -0800 -Subject: [PATCH 1007/1007] Default to fragile ObjC runtime when targeting - darwin/ppc - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - lib/Driver/ToolChains.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h -index fc656af..f9ac275 100644 ---- llvm_master/tools/clang/lib/Driver/ToolChains.h -+++ macports_master/tools/clang/lib/Driver/ToolChains.h -@@ -321,8 +321,10 @@ public: - bool IsEncodeExtendedBlockSignatureDefault() const override { return true; } - - bool IsObjCNonFragileABIDefault() const override { -- // Non-fragile ABI is default for everything but i386. -- return getTriple().getArch() != llvm::Triple::x86; -+ // Non-fragile ABI is default for legacy architectures -+ return getTriple().getArch() != llvm::Triple::x86 && -+ getTriple().getArch() != llvm::Triple::ppc && -+ getTriple().getArch() != llvm::Triple::ppc64; - } - - bool UseObjCMixedDispatch() const override { return true; } --- -2.6.2 - Deleted: trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,34 +0,0 @@ -From 2d2c241cda3099ec3900ee2924201d3d19eea69e Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Mon, 15 Apr 2013 22:38:18 -0700 -Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - make/platform/clang_darwin.mk | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -index f85ced5..62b6f92 100644 ---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk -+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -@@ -125,11 +125,11 @@ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_ioss - # object files. If we are on that platform, strip out all ARM archs. We still - # build the libraries themselves so that Clang can find them where it expects - # them, even though they might not have an expected slice. --ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),) --UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios)) --UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios)) --UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios)) --endif -+#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),) -+#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios)) -+#UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios)) -+#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios)) -+#endif - - # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we - # are intended to support and limit what we try to build to that. --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,32 @@ +From a15a41580c9600b26b5f218a5f2a2796df8078fd Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Mon, 15 Apr 2013 22:38:18 -0700 +Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + make/platform/clang_darwin.mk | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +index ccbee8b..9961b07 100644 +--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk ++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +@@ -105,10 +105,10 @@ UniversalArchs.cc_kext_ios += $(call CheckArches,armv7,cc_kext_ios,$(IOS_SDK)) + # object files. If we are on that platform, strip out all ARM archs. We still + # build the libraries themselves so that Clang can find them where it expects + # them, even though they might not have an expected slice. +-ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),) +-UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios)) +-UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios)) +-endif ++#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),) ++#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios)) ++#UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios)) ++#endif + + # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we + # are intended to support and limit what we try to build to that. +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,32 +0,0 @@ -From 1f0a6b8bdd5b4e4d00eb039f4ebd9dc0a703c091 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 10 Jan 2015 03:34:51 -0800 -Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld - -v doesn't report supported architectures - -Older versions of ld64 (eg: Xcode 3.x) do not report this. - -http://www.llvm.org/bugs/show_bug.cgi?id=22182 - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - make/platform/clang_darwin.mk | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -index 62b6f92..e8b8ced 100644 ---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk -+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -@@ -17,8 +17,7 @@ CheckArches = \ - result=""; \ - if [ "X$(3)" != X ]; then \ - for arch in $(1); do \ -- if $(LD) -v 2>&1 | grep "configured to support" \ -- | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \ -+ if ( $(LD) -v 2>&1 | grep "configured to support" | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null ) || (! ( $(LD) -v 2>&1 | grep -q "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ); then \ - if $(CC) -arch $$arch \ - -integrated-as \ - $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \ --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,32 @@ +From f21aaf7086d1fa29b676e43697f8eefc8df1155b Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 10 Jan 2015 03:34:51 -0800 +Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld + -v doesn't report supported architectures + +Older versions of ld64 (eg: Xcode 3.x) do not report this. + +http://www.llvm.org/bugs/show_bug.cgi?id=22182 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + make/platform/clang_darwin.mk | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +index 9961b07..910eef6 100644 +--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk ++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +@@ -17,8 +17,7 @@ CheckArches = \ + result=""; \ + if [ "X$(3)" != X ]; then \ + for arch in $(1); do \ +- if $(LD) -v 2>&1 | grep "configured to support" \ +- | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \ ++ if ( $(LD) -v 2>&1 | grep "configured to support" | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null ) || (! ( $(LD) -v 2>&1 | grep -q "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ); then \ + if $(CC) -arch $$arch \ + -integrated-as \ + $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \ +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,29 +0,0 @@ -From 4d677715aded5099cadcb7c647729d05a7126930 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 17:45:27 -0800 -Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is - not supported - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - make/platform/clang_darwin.mk | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -index e8b8ced..4f25a55 100644 ---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk -+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -@@ -49,6 +49,10 @@ XCRunSdkPath = \ - result=`xcrun --sdk $(1).internal --show-sdk-path 2> /dev/null`; \ - if [ "$$?" != "0" ]; then \ - result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \ -+ if [ "$$?" != "0" ]; then \ -+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \ -+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \ -+ fi; \ - if [ "$$?" != "0" ]; then result=""; fi; \ - fi; \ - echo $$result) --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,29 @@ +From bd5f4606b2c9ee2ad45c3e524ccb38dd03d80f39 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 17 Jan 2015 17:45:27 -0800 +Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is + not supported + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + make/platform/clang_darwin.mk | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +index 910eef6..62ccc6f 100644 +--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk ++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +@@ -49,6 +49,10 @@ XCRunSdkPath = \ + result=`xcrun --sdk $(1).internal --show-sdk-path 2> /dev/null`; \ + if [ "$$?" != "0" ]; then \ + result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \ ++ if [ "$$?" != "0" ]; then \ ++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \ ++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \ ++ fi; \ + if [ "$$?" != "0" ]; then result=""; fi; \ + fi; \ + echo $$result) +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,55 +0,0 @@ -From efbd8b49c0815fa8a83f8d4cef51e8d0de3cbfad Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 17 Jan 2015 19:55:19 -0800 -Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime - if requested and supported by the SDK and toolchain - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - make/platform/clang_darwin.mk | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -index 4f25a55..3f683e9 100644 ---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk -+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -@@ -80,10 +80,10 @@ Configs += eprintf - UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK)) - - # Configuration for targeting 10.4. We need a few functions missing from --# libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really --# support targeting PowerPC. -+# libgcc_s.10.4.dylib. We don't build ppc64 slices since clang doesn't really -+# support it.. - Configs += 10.4 --UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4,$(OSX_SDK)) -+UniversalArchs.10.4 := $(call CheckArches,ppc i386 x86_64,10.4,$(OSX_SDK)) - - # Configuration for targeting iOS for a couple of functions that didn't - # make it into libSystem. -@@ -94,11 +94,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK)) - # Configuration for targeting OSX. These functions may not be in libSystem - # so we should provide our own. - Configs += osx --UniversalArchs.osx := $(call CheckArches,i386 x86_64 x86_64h,osx,$(OSX_SDK)) -+UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK)) - - # Configuration for use with kernel/kexts. - Configs += cc_kext --UniversalArchs.cc_kext := $(call CheckArches,i386 x86_64 x86_64h,cc_kext,$(OSX_SDK)) -+UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK)) - - # Configuration for use with iOS kernel/kexts - Configs += cc_kext_ios -@@ -106,7 +106,7 @@ UniversalArchs.cc_kext_ios += $(call CheckArches,armv7,cc_kext_ios,$(IOS_SDK)) - - # Configurations which define the profiling support functions. - Configs += profile_osx --UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx,$(OSX_SDK)) -+UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64 x86_64h,profile_osx,$(OSX_SDK)) - Configs += profile_ios - UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK)) - UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK)) --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,46 @@ +From a14027d6a0016043269079906b15c41b9e3039e5 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 17 Jan 2015 19:55:19 -0800 +Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime + if requested and supported by the SDK and toolchain + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + make/platform/clang_darwin.mk | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +index 62ccc6f..da583d2 100644 +--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk ++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +@@ -80,10 +80,10 @@ Configs += eprintf + UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK)) + + # Configuration for targeting 10.4. We need a few functions missing from +-# libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really +-# support targeting PowerPC. ++# libgcc_s.10.4.dylib. We don't build ppc64 slices since clang doesn't really ++# support it.. + Configs += 10.4 +-UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4,$(OSX_SDK)) ++UniversalArchs.10.4 := $(call CheckArches,ppc i386 x86_64,10.4,$(OSX_SDK)) + + # Configuration for targeting iOS for a couple of functions that didn't + # make it into libSystem. +@@ -94,11 +94,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK)) + # Configuration for targeting OSX. These functions may not be in libSystem + # so we should provide our own. + Configs += osx +-UniversalArchs.osx := $(call CheckArches,i386 x86_64 x86_64h,osx,$(OSX_SDK)) ++UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK)) + + # Configuration for use with kernel/kexts. + Configs += cc_kext +-UniversalArchs.cc_kext := $(call CheckArches,i386 x86_64 x86_64h,cc_kext,$(OSX_SDK)) ++UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK)) + + # Configuration for use with iOS kernel/kexts + Configs += cc_kext_ios +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,56 +0,0 @@ -From 1c58350ef60e7b54d8b0ef6ea58791d6e8390b90 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Wed, 14 Jan 2015 19:55:19 -0800 -Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of - compiler-rt - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - make/platform/clang_darwin.mk | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -index 3f683e9..62116a9 100644 ---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk -+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -@@ -94,11 +94,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK)) - # Configuration for targeting OSX. These functions may not be in libSystem - # so we should provide our own. - Configs += osx --UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK)) -+UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64,osx,$(OSX_SDK)) - - # Configuration for use with kernel/kexts. - Configs += cc_kext --UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK)) -+UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64,cc_kext,$(OSX_SDK)) - - # Configuration for use with iOS kernel/kexts - Configs += cc_kext_ios -@@ -106,20 +106,20 @@ UniversalArchs.cc_kext_ios += $(call CheckArches,armv7,cc_kext_ios,$(IOS_SDK)) - - # Configurations which define the profiling support functions. - Configs += profile_osx --UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64 x86_64h,profile_osx,$(OSX_SDK)) -+UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64,profile_osx,$(OSX_SDK)) - Configs += profile_ios - UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK)) - UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK)) - - # Configurations which define the ASAN support functions. - Configs += asan_osx_dynamic --UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK)) -+UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic,$(OSX_SDK)) - - Configs += asan_iossim_dynamic - UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK)) - - Configs += ubsan_osx_dynamic --UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx_dynamic,$(OSX_SDK)) -+UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64,ubsan_osx_dynamic,$(OSX_SDK)) - - Configs += ubsan_iossim_dynamic - UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK)) --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,32 @@ +From b7c20ec302187aed858b72bc4556fc8898fdaf26 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Wed, 14 Jan 2015 19:55:19 -0800 +Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of + compiler-rt + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + make/platform/clang_darwin.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +index da583d2..bf6d701 100644 +--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk ++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +@@ -94,11 +94,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK)) + # Configuration for targeting OSX. These functions may not be in libSystem + # so we should provide our own. + Configs += osx +-UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK)) ++UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64,osx,$(OSX_SDK)) + + # Configuration for use with kernel/kexts. + Configs += cc_kext +-UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK)) ++UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64,cc_kext,$(OSX_SDK)) + + # Configuration for use with iOS kernel/kexts + Configs += cc_kext_ios +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,29 +0,0 @@ -From 7664b6e22365f91d330bf10f3255ad4190410000 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sun, 11 Oct 2015 09:02:26 -0700 -Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when - fixing PR24776 - -Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - make/platform/clang_darwin.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -index 62116a9..6cc3e53 100644 ---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk -+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk -@@ -18,7 +18,7 @@ CheckArches = \ - if [ "X$(3)" != X ]; then \ - for arch in $(1); do \ - if ( $(LD) -v 2>&1 | grep "configured to support" | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null ) || (! ( $(LD) -v 2>&1 | grep -q "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ); then \ -- if $(CC) -arch $$arch \ -+ if $(CC) -arch $$arch -c \ - -integrated-as \ - $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \ - -isysroot $(3) \ --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,29 @@ +From 865eee48fdb2a6f447947f5216c692e9a5b60be3 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sun, 11 Oct 2015 09:02:26 -0700 +Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when + fixing PR24776 + +Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + make/platform/clang_darwin.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +index bf6d701..7571665 100644 +--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk ++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk +@@ -18,7 +18,7 @@ CheckArches = \ + if [ "X$(3)" != X ]; then \ + for arch in $(1); do \ + if ( $(LD) -v 2>&1 | grep "configured to support" | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null ) || (! ( $(LD) -v 2>&1 | grep -q "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ); then \ +- if $(CC) -arch $$arch \ ++ if $(CC) -arch $$arch -c \ + -integrated-as \ + $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \ + -isysroot $(3) \ +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,42 +0,0 @@ -From 4cf3736c2a21e608d12b0fc153533be359029d7b Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Mon, 30 Nov 2015 00:52:14 -0500 -Subject: [PATCH 2007/2007] MacPorts Only: Don't check for the macosx.internal - SDK - -https://llvm.org/bugs/show_bug.cgi?id=25677 - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - cmake/Modules/CompilerRTDarwinUtils.cmake | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake -index 4947ae4..611756a 100644 ---- llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -2,21 +2,12 @@ - # set the default Xcode to use. This function finds the SDKs that are present in - # the current Xcode. - function(find_darwin_sdk_dir var sdk_name) -- # Let's first try the internal SDK, otherwise use the public SDK. -- execute_process( -- COMMAND xcodebuild -version -sdk ${sdk_name}.internal Path -- OUTPUT_VARIABLE var_internal -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ERROR_FILE /dev/null -- ) -- if("" STREQUAL "${var_internal}") - execute_process( - COMMAND xcodebuild -version -sdk ${sdk_name} Path - OUTPUT_VARIABLE var_internal - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_FILE /dev/null - ) -- endif() - set(${var} ${var_internal} PARENT_SCOPE) - endfunction() - --- -2.6.3 - Added: trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch (rev 0) +++ trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -0,0 +1,42 @@ +From b192691c40df3a00ad8eb0fc38a4a36496adac19 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Mon, 30 Nov 2015 00:52:14 -0500 +Subject: [PATCH 2007/2007] MacPorts Only: Don't check for the macosx.internal + SDK + +https://llvm.org/bugs/show_bug.cgi?id=25677 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + cmake/Modules/CompilerRTDarwinUtils.cmake | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +index 895ecdc..2902f9d 100644 +--- llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -2,21 +2,12 @@ + # set the default Xcode to use. This function finds the SDKs that are present in + # the current Xcode. + function(find_darwin_sdk_dir var sdk_name) +- # Let's first try the internal SDK, otherwise use the public SDK. +- execute_process( +- COMMAND xcodebuild -version -sdk ${sdk_name}.internal Path +- OUTPUT_VARIABLE var_internal +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_FILE /dev/null +- ) +- if("" STREQUAL "${var_internal}") + execute_process( + COMMAND xcodebuild -version -sdk ${sdk_name} Path + OUTPUT_VARIABLE var_internal + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_FILE /dev/null + ) +- endif() + set(${var} ${var_internal} PARENT_SCOPE) + endfunction() + +-- +2.7.0 + Deleted: trunk/dports/lang/llvm-3.9/files/llvm-skip-unittests.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/llvm-skip-unittests.patch 2016-02-01 22:28:30 UTC (rev 145330) +++ trunk/dports/lang/llvm-3.9/files/llvm-skip-unittests.patch 2016-02-01 23:43:34 UTC (rev 145331) @@ -1,13 +0,0 @@ -diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest -index bd32aed..993b69a 100644 ---- a/unittests/Makefile.unittest -+++ b/unittests/Makefile.unittest -@@ -54,7 +54,7 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) - $(Echo) ======= Finished Linking $(BuildMode) Unit test $(TESTNAME) \ - $(StripWarnMsg) - --all:: $(LLVMUnitTestExe) -+all:: - - unitcheck:: $(LLVMUnitTestExe) - $(Run.Shared) $(LLVMUnitTestExe)