[132960] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Mon Feb 16 01:21:40 PST 2015
Revision: 132960
https://trac.macports.org/changeset/132960
Author: jeremyhu at macports.org
Date: 2015-02-16 01:21:40 -0800 (Mon, 16 Feb 2015)
Log Message:
-----------
llvm-*: Correctly honor the -assertions variant (#46754)
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
trunk/dports/lang/llvm-3.7/Portfile
trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.3/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
@@ -4,9 +4,9 @@
PortGroup select 1.0
set llvm_version 3.3
-revision 4
+revision 7
name llvm-${llvm_version}
-subport clang-${llvm_version} { revision 6 }
+subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -116,7 +116,7 @@
configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
--enable-optimized --disable-profiling --enable-pic \
--enable-debug-symbols --disable-debug-runtime \
- --prefix="${sub_prefix}"
+ --prefix="${sub_prefix}" --disable-assertions
if {${subport} == "llvm-${llvm_version}"} {
select.group llvm
@@ -150,6 +150,7 @@
}
variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
+ configure.args-delete --disable-assertions
configure.args-append --enable-assertions
}
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
@@ -7,8 +7,8 @@
set llvm_version 3.4
set llvm_version_no_dot 34
name llvm-${llvm_version}
-revision 1
-subport clang-${llvm_version} { revision 5 }
+revision 6
+subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -159,7 +159,7 @@
configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
--enable-optimized --disable-profiling --enable-pic \
--enable-debug-symbols --disable-debug-runtime \
- --prefix="${sub_prefix}"
+ --prefix="${sub_prefix}" --disable-assertions
if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
@@ -196,6 +196,7 @@
}
variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
+ configure.args-delete --disable-assertions
configure.args-append --enable-assertions
}
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
@@ -7,8 +7,8 @@
set llvm_version 3.5
set llvm_version_no_dot 35
name llvm-${llvm_version}
-revision 1
-subport clang-${llvm_version} { revision 2 }
+revision 3
+subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -172,7 +172,7 @@
configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
--enable-optimized --disable-profiling --enable-pic \
--enable-debug-symbols --disable-debug-runtime \
- --prefix="${sub_prefix}"
+ --prefix="${sub_prefix}" --disable-assertions
if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
@@ -227,6 +227,7 @@
}
variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
+ configure.args-delete --disable-assertions
configure.args-append --enable-assertions
}
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
@@ -63,7 +63,7 @@
}
fetch.type svn
-svn.revision 226372
+svn.revision 229298
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
@@ -140,7 +140,7 @@
configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
--enable-optimized --disable-profiling --enable-pic \
--enable-debug-symbols --disable-debug-runtime \
- --prefix="${sub_prefix}"
+ --prefix="${sub_prefix}" --disable-assertions
if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
@@ -195,6 +195,7 @@
}
variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
+ configure.args-delete --disable-assertions
configure.args-append --enable-assertions
}
Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-02-16 09:21:40 UTC (rev 132960)
@@ -63,7 +63,7 @@
}
fetch.type svn
-svn.revision 226372
+svn.revision 229298
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
@@ -140,7 +140,7 @@
configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
--enable-optimized --disable-profiling --enable-pic \
--enable-debug-symbols --disable-debug-runtime \
- --prefix="${sub_prefix}"
+ --prefix="${sub_prefix}" --disable-assertions
if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
@@ -195,6 +195,7 @@
}
variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
+ configure.args-delete --disable-assertions
configure.args-append --enable-assertions
}
Modified: trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-02-16 09:21:40 UTC (rev 132960)
@@ -1,4 +1,4 @@
-From 1a76dc937816603c8da46b0a16985f28e3a3b9dd Mon Sep 17 00:00:00 2001
+From 6f543c369c868da8eabc97b27b64ddaaf7fa7a00 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon, 15 Apr 2013 22:38:18 -0700
Subject: [PATCH 2001/2004] MacPorts Only: Comment out SL cctools workaround
@@ -9,10 +9,10 @@
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 f4f548e..6f62170 100644
+index 4f71c0b..cc553ae 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
+@@ -126,12 +126,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
# 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.
@@ -32,5 +32,5 @@
# 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.2.2
+2.3.0
Modified: trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-02-16 09:21:40 UTC (rev 132960)
@@ -1,4 +1,4 @@
-From be3909d280cae05c93c520bfb1e7a8f0ed5a11af Mon Sep 17 00:00:00 2001
+From 23ae20f935fb745104ff31cc280ed4bdd059b655 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 10 Jan 2015 03:34:51 -0800
Subject: [PATCH 2002/2004] Update CheckArches to fallback on Intel/ppc if ld
@@ -14,7 +14,7 @@
1 file changed, 2 insertions(+)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 6f62170..0120547 100644
+index cc553ae..08e97f5 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -25,6 +25,8 @@ CheckArches = \
@@ -27,5 +27,5 @@
printf 1>&2 \
"warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
--
-2.2.2
+2.3.0
Modified: trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-02-16 09:21:40 UTC (rev 132960)
@@ -1,4 +1,4 @@
-From 9de48c64a81a3cd9bee512fce88b81bcc7b38bb8 Mon Sep 17 00:00:00 2001
+From 0d87693a90dbd828868f125bbc6f496659e4ce14 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:45:27 -0800
Subject: [PATCH 2003/2004] Fall back on xcodebuild -sdk when xcrun --sdk is
@@ -10,20 +10,20 @@
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 0120547..ac8de4a 100644
+index 08e97f5..d99081b 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 @@ XCRun = \
- 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; \
+@@ -52,6 +52,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.2.2
+2.3.0
Modified: trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-02-16 03:52:47 UTC (rev 132959)
+++ trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-02-16 09:21:40 UTC (rev 132960)
@@ -1,4 +1,4 @@
-From 1fe76a2b12f4837c49237cdca6803e5f43e00f7c Mon Sep 17 00:00:00 2001
+From f0e6107c4e73d8da46ffe0ed530bfc0d48f69e06 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 19:55:19 -0800
Subject: [PATCH 2004/2004] On darwin, build ppc slices of the compiler runtime
@@ -10,10 +10,10 @@
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 ac8de4a..6936031 100644
+index d99081b..09c9a86 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -79,10 +79,10 @@ Configs += eprintf
+@@ -83,10 +83,10 @@ Configs += eprintf
UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
# Configuration for targeting 10.4. We need a few functions missing from
@@ -27,7 +27,7 @@
# Configuration for targeting iOS for a couple of functions that didn't
# make it into libSystem.
-@@ -93,11 +93,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
+@@ -97,11 +97,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
@@ -41,7 +41,7 @@
UniversalArchs.cc_kext += $(call CheckArches,armv7 arm64,cc_kext,$(IOS_SDK))
# Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used
-@@ -109,7 +109,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
+@@ -113,7 +113,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
# Configurations which define the profiling support functions.
Configs += profile_osx
@@ -51,5 +51,5 @@
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
--
-2.2.2
+2.3.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150216/fe9464f3/attachment-0001.html>
More information about the macports-changes
mailing list