[131262] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 7 14:52:46 PST 2015
Revision: 131262
https://trac.macports.org/changeset/131262
Author: jeremyhu at macports.org
Date: 2015-01-07 14:52:46 -0800 (Wed, 07 Jan 2015)
Log Message:
-----------
clang-3.[3456]: On Leopard, default to -fno-blocks
Not revbumping 3.5 and 3.6 because they still don't build with Leopard
Not applying ot 3.2 and earlier because I'm considering obsoleting those ports
Modified Paths:
--------------
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-3.5/Portfile
trunk/dports/lang/llvm-3.6/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.3/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
@@ -6,7 +6,7 @@
set llvm_version 3.3
revision 4
name llvm-${llvm_version}
-subport clang-${llvm_version} { revision 5 }
+subport clang-${llvm_version} { revision 6 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -171,7 +171,7 @@
}
if {${subport} == "clang-${llvm_version}" && ${os.major} <= 9} {
- patchfiles-append leopard-no-asan.patch
+ patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
}
# TODO: The llvm build system sets a 10.1 deployment target on Yosemite
Added: trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
@@ -0,0 +1,26 @@
+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
@@ -8,7 +8,7 @@
set llvm_version_no_dot 34
name llvm-${llvm_version}
revision 1
-subport clang-${llvm_version} { revision 3 }
+subport clang-${llvm_version} { revision 4 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -199,7 +199,7 @@
}
if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
- patchfiles-append leopard-no-asan.patch
+ patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
}
# TODO: The llvm build system sets a 10.1 deployment target on Yosemite
Added: trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
@@ -0,0 +1,26 @@
+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
@@ -221,6 +221,10 @@
configure.optflags -Os
}
+ if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
+ patchfiles-append 0001-Leopard-Default-to-fno-blocks.patch
+ }
+
# TODO: The llvm build system sets a 10.1 deployment target on Yosemite
if {[vercmp ${macosx_deployment_target} 10.10] >= 0} {
macosx_deployment_target 10.9
Added: trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
@@ -0,0 +1,26 @@
+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-07 21:39:36 UTC (rev 131261)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-07 22:52:46 UTC (rev 131262)
@@ -204,9 +204,8 @@
configure.optflags -Os
}
- # TODO: The llvm build system sets a 10.1 deployment target on Yosemite
- if {[vercmp ${macosx_deployment_target} 10.10] >= 0} {
- macosx_deployment_target 10.9
+ if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
+ patchfiles-append 0001-Leopard-Default-to-fno-blocks.patch
}
}
Added: trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-07 22:52:46 UTC (rev 131262)
@@ -0,0 +1,26 @@
+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150107/fb968934/attachment-0001.html>
More information about the macports-changes
mailing list