[135538] trunk/dports/lang/llvm-3.7
jeremyhu at macports.org
jeremyhu at macports.org
Sat Apr 25 12:17:46 PDT 2015
Revision: 135538
https://trac.macports.org/changeset/135538
Author: jeremyhu at macports.org
Date: 2015-04-25 12:17:45 -0700 (Sat, 25 Apr 2015)
Log Message:
-----------
llvm-3.7: Bump to r235803
Revision Links:
--------------
https://trac.macports.org/changeset/235803
Modified Paths:
--------------
trunk/dports/lang/llvm-3.7/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.7/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
trunk/dports/lang/llvm-3.7/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile 2015-04-25 18:28:01 UTC (rev 135537)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-04-25 19:17:45 UTC (rev 135538)
@@ -63,7 +63,7 @@
}
fetch.type svn
-svn.revision 234122
+svn.revision 235803
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
@@ -97,10 +97,11 @@
patch.pre_args -p1
patchfiles \
0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
- 0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \
- 0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
- 0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
- 0005-MacPorts-Only-Skip-checking-for-python-in-configure.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 \
llvm-skip-unittests.patch
if {${subport} eq "clang-${llvm_version}"} {
Deleted: trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-04-25 18:28:01 UTC (rev 135537)
+++ trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -1,57 +0,0 @@
-From 53f17b9930d8ace72f8a8f241bc54ce65e29ecd0 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 09:03:43 -0800
-Subject: [PATCH 1/5] Set the Mach-O CPU Subtype to ppc7400 when targeting
- Leopard
-
-http://llvm.org/bugs/show_bug.cgi?id=18463
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git llvm_origin_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp llvm_macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
-index bea88a2..a049c2a 100644
---- llvm_origin_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
-+++ llvm_macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
-@@ -205,16 +205,23 @@ public:
- // FIXME: This should be in a separate file.
- namespace {
- class DarwinPPCAsmBackend : public PPCAsmBackend {
-+ Triple TheTriple;
- public:
-- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, false) { }
-+ DarwinPPCAsmBackend(const Target &T, StringRef TT) : PPCAsmBackend(T, false), TheTriple(TT) { }
-
- MCObjectWriter *createObjectWriter(raw_ostream &OS) const override {
- bool is64 = getPointerSize() == 8;
-+ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
-+
-+ if (TheTriple.isOSDarwin() && !TheTriple.isMacOSXVersionLT(10,5)) {
-+ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
-+ }
-+
- return createPPCMachObjectWriter(
- OS,
- /*Is64Bit=*/is64,
- (is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
-- MachO::CPU_SUBTYPE_POWERPC_ALL);
-+ CS);
- }
- };
-
-@@ -236,8 +243,9 @@ namespace {
- MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
- const MCRegisterInfo &MRI,
- StringRef TT, StringRef CPU) {
-+
- if (Triple(TT).isOSDarwin())
-- return new DarwinPPCAsmBackend(T);
-+ return new DarwinPPCAsmBackend(T, TT);
-
- uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(Triple(TT).getOS());
- bool IsLittleEndian = Triple(TT).getArch() == Triple::ppc64le;
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -0,0 +1,57 @@
+From 7d437f9b6919c94737596f2aa981a90171485147 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 09:03:43 -0800
+Subject: [PATCH 1/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
+ Leopard
+
+http://llvm.org/bugs/show_bug.cgi?id=18463
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+index 86885e1..93e69f1 100644
+--- llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+@@ -200,16 +200,23 @@ public:
+ // FIXME: This should be in a separate file.
+ namespace {
+ class DarwinPPCAsmBackend : public PPCAsmBackend {
++ Triple TheTriple;
+ public:
+- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, false) { }
++ DarwinPPCAsmBackend(const Target &T, StringRef TT) : PPCAsmBackend(T, false), TheTriple(TT) { }
+
+ MCObjectWriter *createObjectWriter(raw_pwrite_stream &OS) const override {
+ bool is64 = getPointerSize() == 8;
++ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
++
++ if (TheTriple.isOSDarwin() && !TheTriple.isMacOSXVersionLT(10,5)) {
++ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
++ }
++
+ return createPPCMachObjectWriter(
+ OS,
+ /*Is64Bit=*/is64,
+ (is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
+- MachO::CPU_SUBTYPE_POWERPC_ALL);
++ CS);
+ }
+ };
+
+@@ -230,8 +237,9 @@ namespace {
+ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
+ const MCRegisterInfo &MRI,
+ StringRef TT, StringRef CPU) {
++
+ if (Triple(TT).isOSDarwin())
+- return new DarwinPPCAsmBackend(T);
++ return new DarwinPPCAsmBackend(T, TT);
+
+ uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(Triple(TT).getOS());
+ bool IsLittleEndian = Triple(TT).getArch() == Triple::ppc64le;
+--
+2.3.6
+
Added: trunk/dports/lang/llvm-3.7/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -0,0 +1,36 @@
+From c970cc398a56fd669e2961629382169d1ba6f125 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 18 Jan 2015 11:18:13 -0800
+Subject: [PATCH 2/6] 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
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Support/Unix/Signals.inc | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc
+index 057bcab1..5317dc1 100644
+--- llvm_master/lib/Support/Unix/Signals.inc
++++ macports_master/lib/Support/Unix/Signals.inc
+@@ -490,6 +490,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) {
+ AddSignalHandler(PrintStackTraceSignalHandler, nullptr);
+
+ #if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES)
++
++/* These aren't defined in the 10.4 SDK, so provide them here */
++#ifndef EXC_MASK_CRASH
++#define EXC_MASK_CRASH 0x400
++#endif
++#ifndef MACH_EXCEPTION_CODES
++#define MACH_EXCEPTION_CODES 0x80000000
++#endif
++
+ // Environment variable to disable any kind of crash dialog.
+ if (DisableCrashReporting || getenv("LLVM_DISABLE_CRASH_REPORT")) {
+ mach_port_t self = mach_task_self();
+--
+2.3.6
+
Deleted: trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-04-25 18:28:01 UTC (rev 135537)
+++ trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -1,31 +0,0 @@
-From b514fa09a560de0b3241c6af0d134bae09a6aec3 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 16:33:09 -0800
-Subject: [PATCH 2/5] MacPorts Only: Update install targets for clang subport
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git llvm_origin_master/Makefile llvm_macports_master/Makefile
-index 2b9468a..19fbfdc 100644
---- llvm_origin_master/Makefile
-+++ llvm_macports_master/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.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -0,0 +1,31 @@
+From 0ce2a130b451991645a4a53453ff5929a85094c0 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:33:09 -0800
+Subject: [PATCH 3/6] MacPorts Only: Update install targets for clang subport
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/Makefile macports_master/Makefile
+index 2b9468a..19fbfdc 100644
+--- llvm_master/Makefile
++++ macports_master/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.3.6
+
Deleted: trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2015-04-25 18:28:01 UTC (rev 135537)
+++ trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -1,32 +0,0 @@
-From 101281fb51d2ce628839134eeedb9533d4506192 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 16:34:41 -0800
-Subject: [PATCH 3/5] MacPorts Only: Use full path for the dylib id instead of
- @rpath
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- Makefile.rules | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git llvm_origin_master/Makefile.rules llvm_macports_master/Makefile.rules
-index c8c971f..78b9c51 100644
---- llvm_origin_master/Makefile.rules
-+++ llvm_macports_master/Makefile.rules
-@@ -598,7 +598,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.2.2
-
Deleted: trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2015-04-25 18:28:01 UTC (rev 135537)
+++ trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -1,29 +0,0 @@
-From ff5040cbee319c918097b40312ca3c9d6ba5f19a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 16:41:30 -0800
-Subject: [PATCH 4/5] 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 at apple.com>
----
- lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git llvm_origin_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp llvm_macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-index bbed808..1de5715 100644
---- llvm_origin_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-+++ llvm_macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-@@ -186,7 +186,7 @@ bool AsmPrinter::doInitialization(Module &M) {
- // use the directive, where it would need the same conditionalization
- // anyway.
- Triple TT(getTargetTriple());
-- if (TT.isOSDarwin()) {
-+ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
- unsigned Major, Minor, Update;
- TT.getOSVersion(Major, Minor, Update);
- // If there is a version specified, Major will be non-zero.
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -0,0 +1,32 @@
+From 9c6f4a750262a4711c053b5a732782a4b7dd085f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:34:41 -0800
+Subject: [PATCH 4/6] MacPorts Only: Use full path for the dylib id instead of
+ @rpath
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile.rules | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git llvm_master/Makefile.rules macports_master/Makefile.rules
+index 24cac3b..8775589 100644
+--- llvm_master/Makefile.rules
++++ macports_master/Makefile.rules
+@@ -598,7 +598,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.3.6
+
Added: trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -0,0 +1,29 @@
+From f9b4ed9fc963fde5f936c9363193a51f0068f541 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:41:30 -0800
+Subject: [PATCH 5/6] 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 at 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 a8fb9b7..248abb4 100644
+--- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
++++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+@@ -191,7 +191,7 @@ bool AsmPrinter::doInitialization(Module &M) {
+ // use the directive, where it would need the same conditionalization
+ // anyway.
+ Triple TT(getTargetTriple());
+- if (TT.isOSDarwin()) {
++ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
+ unsigned Major, Minor, Update;
+ TT.getOSVersion(Major, Minor, Update);
+ // If there is a version specified, Major will be non-zero.
+--
+2.3.6
+
Deleted: trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-04-25 18:28:01 UTC (rev 135537)
+++ trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -1,111 +0,0 @@
-From cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 16:43:00 -0800
-Subject: [PATCH 5/5] MacPorts Only: Skip checking for python in configure
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- configure | 87 ---------------------------------------------------------------
- 1 file changed, 87 deletions(-)
-
-diff --git llvm_origin_master/configure llvm_macports_master/configure
-index e72c11d..eeedeb7 100755
---- llvm_origin_master/configure
-+++ llvm_macports_master/configure
-@@ -8142,93 +8142,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_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.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-04-25 19:17:45 UTC (rev 135538)
@@ -0,0 +1,111 @@
+From ed0e2b9e8de53e74cc59ad7a76e6cf9f43065b63 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:43:00 -0800
+Subject: [PATCH 6/6] MacPorts Only: Skip checking for python in configure
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ configure | 87 ---------------------------------------------------------------
+ 1 file changed, 87 deletions(-)
+
+diff --git llvm_master/configure macports_master/configure
+index 7ddb0f3..7db3a37 100755
+--- llvm_master/configure
++++ macports_master/configure
+@@ -8438,93 +8438,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_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.3.6
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150425/bfb7d315/attachment-0001.html>
More information about the macports-changes
mailing list