[120439] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Tue May 27 21:53:02 PDT 2014
Revision: 120439
https://trac.macports.org/changeset/120439
Author: jeremyhu at macports.org
Date: 2014-05-27 21:53:02 -0700 (Tue, 27 May 2014)
Log Message:
-----------
llvm*: Revbump for new isl ABI and fix some select issues (#40615, #42913)
Modified Paths:
--------------
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-2.9/files/mp-clang-2.9
trunk/dports/lang/llvm-2.9/files/mp-llvm-2.9
trunk/dports/lang/llvm-3.0/Portfile
trunk/dports/lang/llvm-3.0/files/mp-clang-3.0
trunk/dports/lang/llvm-3.0/files/mp-llvm-3.0
trunk/dports/lang/llvm-3.1/Portfile
trunk/dports/lang/llvm-3.1/files/mp-clang-3.1
trunk/dports/lang/llvm-3.1/files/mp-llvm-3.1
trunk/dports/lang/llvm-3.2/Portfile
trunk/dports/lang/llvm-3.2/files/mp-clang-3.2
trunk/dports/lang/llvm-3.2/files/mp-llvm-3.2
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/llvm-3.3/files/mp-clang-3.3
trunk/dports/lang/llvm-3.3/files/mp-llvm-3.3
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-3.4/files/mp-clang-3.4
trunk/dports/lang/llvm-3.4/files/mp-llvm-3.4
trunk/dports/lang/llvm-3.5/Portfile
trunk/dports/lang/llvm-3.5/files/mp-clang-3.5
trunk/dports/lang/llvm-3.5/files/mp-llvm-3.5
Added Paths:
-----------
trunk/dports/lang/llvm-3.4/files/clang-format.patch
trunk/dports/lang/llvm-3.4/files/polly-isl-0.13.patch
trunk/dports/lang/llvm-3.5/files/clang-format.patch
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-2.9/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 2.9
-revision 13
+revision 14
name llvm-${llvm_version}
subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
Modified: trunk/dports/lang/llvm-2.9/files/mp-clang-2.9
===================================================================
--- trunk/dports/lang/llvm-2.9/files/mp-clang-2.9 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-2.9/files/mp-clang-2.9 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
-
bin/clang++-mp-2.9
bin/clang-mp-2.9
+-
+-
bin/scan-build-mp-2.9
bin/scan-view-mp-2.9
Modified: trunk/dports/lang/llvm-2.9/files/mp-llvm-2.9
===================================================================
--- trunk/dports/lang/llvm-2.9/files/mp-llvm-2.9 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-2.9/files/mp-llvm-2.9 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
bin/llvm-ld-mp-2.9
bin/llvm-link-mp-2.9
bin/llvm-mc-mp-2.9
+-
bin/llvm-nm-mp-2.9
bin/llvm-objdump-mp-2.9
bin/llvm-prof-mp-2.9
@@ -20,6 +21,8 @@
-
-
bin/llvm-stub-mp-2.9
+-
+-
bin/tblgen-mp-2.9
bin/llvmc-mp-2.9
bin/macho-dump-mp-2.9
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.0/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 3.0
-revision 12
+revision 13
name llvm-${llvm_version}
subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
Modified: trunk/dports/lang/llvm-3.0/files/mp-clang-3.0
===================================================================
--- trunk/dports/lang/llvm-3.0/files/mp-clang-3.0 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.0/files/mp-clang-3.0 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
bin/c-index-test-mp-3.0
bin/clang++-mp-3.0
bin/clang-mp-3.0
+-
+-
bin/scan-build-mp-3.0
bin/scan-view-mp-3.0
Modified: trunk/dports/lang/llvm-3.0/files/mp-llvm-3.0
===================================================================
--- trunk/dports/lang/llvm-3.0/files/mp-llvm-3.0 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.0/files/mp-llvm-3.0 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
bin/llvm-ld-mp-3.0
bin/llvm-link-mp-3.0
bin/llvm-mc-mp-3.0
+-
bin/llvm-nm-mp-3.0
bin/llvm-objdump-mp-3.0
bin/llvm-prof-mp-3.0
@@ -20,6 +21,8 @@
bin/llvm-rtdyld-mp-3.0
bin/llvm-size-mp-3.0
bin/llvm-stub-mp-3.0
+-
+-
bin/llvm-tblgen-mp-3.0
-
bin/macho-dump-mp-3.0
Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.1/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 3.1
-revision 7
+revision 8
name llvm-${llvm_version}
subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
Modified: trunk/dports/lang/llvm-3.1/files/mp-clang-3.1
===================================================================
--- trunk/dports/lang/llvm-3.1/files/mp-clang-3.1 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.1/files/mp-clang-3.1 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
bin/c-index-test-mp-3.1
bin/clang++-mp-3.1
bin/clang-mp-3.1
+-
+-
bin/scan-build-mp-3.1
bin/scan-view-mp-3.1
Modified: trunk/dports/lang/llvm-3.1/files/mp-llvm-3.1
===================================================================
--- trunk/dports/lang/llvm-3.1/files/mp-llvm-3.1 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.1/files/mp-llvm-3.1 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
bin/llvm-ld-mp-3.1
bin/llvm-link-mp-3.1
bin/llvm-mc-mp-3.1
+-
bin/llvm-nm-mp-3.1
bin/llvm-objdump-mp-3.1
bin/llvm-prof-mp-3.1
@@ -20,6 +21,8 @@
bin/llvm-rtdyld-mp-3.1
bin/llvm-size-mp-3.1
bin/llvm-stub-mp-3.1
+bin/llvm-stress-mp-3.1
+-
bin/llvm-tblgen-mp-3.1
-
bin/macho-dump-mp-3.1
Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.2/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 3.2
-revision 2
+revision 3
name llvm-${llvm_version}
subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
Modified: trunk/dports/lang/llvm-3.2/files/mp-clang-3.2
===================================================================
--- trunk/dports/lang/llvm-3.2/files/mp-clang-3.2 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.2/files/mp-clang-3.2 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
-
bin/clang++-mp-3.2
bin/clang-mp-3.2
+-
+-
bin/scan-build-mp-3.2
bin/scan-view-mp-3.2
Modified: trunk/dports/lang/llvm-3.2/files/mp-llvm-3.2
===================================================================
--- trunk/dports/lang/llvm-3.2/files/mp-llvm-3.2 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.2/files/mp-llvm-3.2 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
-
bin/llvm-link-mp-3.2
bin/llvm-mc-mp-3.2
+bin/llvm-mcmarkup-mp-3.2
bin/llvm-nm-mp-3.2
bin/llvm-objdump-mp-3.2
bin/llvm-prof-mp-3.2
@@ -20,6 +21,8 @@
bin/llvm-rtdyld-mp-3.2
bin/llvm-size-mp-3.2
-
+bin/llvm-stress-mp-3.2
+-
bin/llvm-tblgen-mp-3.2
-
bin/macho-dump-mp-3.2
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.3/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -4,9 +4,9 @@
PortGroup select 1.0
set llvm_version 3.3
-revision 1
+revision 4
name llvm-${llvm_version}
-subport clang-${llvm_version} { revision 3 }
+subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
Modified: trunk/dports/lang/llvm-3.3/files/mp-clang-3.3
===================================================================
--- trunk/dports/lang/llvm-3.3/files/mp-clang-3.3 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.3/files/mp-clang-3.3 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
-
bin/clang++-mp-3.3
bin/clang-mp-3.3
+-
+-
bin/scan-build-mp-3.3
bin/scan-view-mp-3.3
Modified: trunk/dports/lang/llvm-3.3/files/mp-llvm-3.3
===================================================================
--- trunk/dports/lang/llvm-3.3/files/mp-llvm-3.3 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.3/files/mp-llvm-3.3 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
-
bin/llvm-link-mp-3.3
bin/llvm-mc-mp-3.3
+bin/llvm-mcmarkup-mp-3.3
bin/llvm-nm-mp-3.3
bin/llvm-objdump-mp-3.3
bin/llvm-prof-mp-3.3
@@ -20,6 +21,8 @@
bin/llvm-rtdyld-mp-3.3
bin/llvm-size-mp-3.3
-
+bin/llvm-stress-mp-3.3
+bin/llvm-symbolizer-mp-3.3
bin/llvm-tblgen-mp-3.3
-
bin/macho-dump-mp-3.3
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.4/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -5,6 +5,7 @@
set llvm_version 3.4
set llvm_version_no_dot 34
+revision 2
name llvm-${llvm_version}
subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
@@ -16,7 +17,6 @@
maintainers jeremyhu
if {${subport} == "llvm-${llvm_version}"} {
- revision 1
homepage http://llvm.org/
description llvm is a next generation compiler infrastructure
long_description The LLVM Core libraries provide a modern source- and \
@@ -43,7 +43,7 @@
library to parse C/C++ code.
depends_lib port:llvm-${llvm_version} port:libffi
- depends_run port:clang_select port:ld64
+ depends_run port:clang_select port:ld64 port:python27
depends_extract bin:svn:subversion
depends_build port:cctools
depends_skip_archcheck-append cctools ld64 subversion
@@ -57,7 +57,6 @@
#set compiler_rt_rev ${svn.revision}
#set libcxx_rev ${svn.revision}
#version ${llvm_version}-r${svn.revision}
-#revision 0
#worksrcdir trunk
#svn.url http://llvm.org/svn/llvm-project/llvm/trunk
#worksrcdir release_${llvm_version_no_dot}
@@ -105,6 +104,7 @@
if {${subport} == "clang-${llvm_version}"} {
patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
0001-Comment-out-SL-cctools-workaround.patch \
+ clang-format.patch \
snowleopard-cmath.patch
build.target clang-only
@@ -293,6 +293,8 @@
if {${subport} == "llvm-${llvm_version}"} {
variant polly description {Provide the polly polyhedral optimizer} {
+ patchfiles-append polly-isl-0.13.patch
+
depends_lib-append \
port:gmp \
path:lib/pkgconfig/isl.pc:isl \
@@ -315,45 +317,15 @@
default_variants-append +arm_runtime
}
- set pythonver ""
- set pythonverdot ""
-
- if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants-append +python27
- }
-
- variant python25 conflicts python26 python27 description {Use python 2.5} {
- set pythonver 25
- set pythonverdot 2.5
- configure.args-append --with-python=${prefix}/bin/python2.5
- }
-
- variant python26 conflicts python25 python27 description {Use python 2.6} {
- set pythonver 26
- set pythonverdot 2.6
- configure.args-append --with-python=${prefix}/bin/python2.6
- }
-
- variant python27 conflicts python25 python26 description {Use python 2.7} {
- set pythonver 27
- set pythonverdot 2.7
- configure.args-append --with-python=${prefix}/bin/python2.7
- }
-
variant analyzer description {Install clang static analyzer} {
- if {[string equal "${pythonver}" ""]} {
- ui_error "You must select a python variant to use the clang static analyzer (+analyzer)"
- error "Invalid variant combination"
- }
+ depends_run-append port:perl5
- depends_run-append port:perl5 port:python${pythonver}
-
post-patch {
reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/scan-build
- reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
+ reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/scan-view
}
@@ -378,6 +350,27 @@
reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/scan-view-${suffix}"
}
}
+
+
+ post-patch {
+ reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-diff.py \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-sublime.py \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format.el \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format.py
+ }
+
+ post-destroot {
+ file mkdir ${destroot}${sub_prefix}/libexec
+ file copy ${worksrcpath}/tools/clang/tools/clang-format ${destroot}${sub_prefix}/libexec/clang-format
+
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/.svn
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Makefile
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Release+Debug+Asserts
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/CMakeLists.txt
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/ClangFormat.cpp
+ }
}
livecheck.type none
Added: trunk/dports/lang/llvm-3.4/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/clang-format.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/clang-format.patch 2014-05-28 04:53:02 UTC (rev 120439)
@@ -0,0 +1,70 @@
+--- a/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2012-04-20 10:09:40.000000000 -0700
+@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
+ 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
+--- a/tools/clang/tools/clang-format/clang-format-diff.py 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-diff.py 2012-04-20 10:09:40.000000000 -0700
+@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
+
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+
+ def main():
+
+--- a/tools/clang/tools/clang-format/clang-format.el 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format.el 2012-04-20 10:09:40.000000000 -0700
+@@ -13,7 +13,7 @@ ifeq ($(HOST_OS),Darwin)
+
+ ;; *Location of the clang-format binary. If it is on your PATH, a full path name
+ ;; need not be specified.
+-(defvar clang-format-binary "clang-format")
++(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
+
+ (defun clang-format-region ()
+ "Use clang-format to format the currently active region."
+--- a/tools/clang/tools/clang-format/clang-format.py 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format.py 2012-04-20 10:09:40.000000000 -0700
+@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),Darwin)
+ import vim
+
+ # 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
+
+--- a/tools/clang/tools/clang-format/clang-format-sublime.py2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-sublime.py 2012-04-20 10:09:40.000000000 -0700
+@@ -18,7 +18,7 @@ ifeq ($(HOST_OS),Darwin)
+ 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
+--- a/Makefile 2013-10-02 08:42:23.000000000 -0700
++++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
+@@ -70,8 +70,9 @@ 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/runtime tools/clang/docs \
+- tools/clang/include tools/clang/lib
++ tools/clang/include tools/clang/lib \
++ tools/clang/tools/clang-format
+ OPTIONAL_DIRS :=
+ NO_INSTALL = 1
+ endif
Modified: trunk/dports/lang/llvm-3.4/files/mp-clang-3.4
===================================================================
--- trunk/dports/lang/llvm-3.4/files/mp-clang-3.4 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.4/files/mp-clang-3.4 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
-
bin/clang++-mp-3.4
bin/clang-mp-3.4
+bin/clang-format-mp-3.4
+-
bin/scan-build-mp-3.4
bin/scan-view-mp-3.4
Modified: trunk/dports/lang/llvm-3.4/files/mp-llvm-3.4
===================================================================
--- trunk/dports/lang/llvm-3.4/files/mp-llvm-3.4 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.4/files/mp-llvm-3.4 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
-
bin/llvm-link-mp-3.4
bin/llvm-mc-mp-3.4
+bin/llvm-mcmarkup-mp-3.4
bin/llvm-nm-mp-3.4
bin/llvm-objdump-mp-3.4
-
@@ -20,6 +21,8 @@
bin/llvm-rtdyld-mp-3.4
bin/llvm-size-mp-3.4
-
+bin/llvm-stress-mp-3.4
+bin/llvm-symbolizer-mp-3.4
bin/llvm-tblgen-mp-3.4
-
bin/macho-dump-mp-3.4
Added: trunk/dports/lang/llvm-3.4/files/polly-isl-0.13.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/polly-isl-0.13.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/polly-isl-0.13.patch 2014-05-28 04:53:02 UTC (rev 120439)
@@ -0,0 +1,52 @@
+--- a/tools/polly/lib/ScheduleOptimizer.cpp 2013/06/23 01:29:29 184655
++++ b/tools/polly/lib/ScheduleOptimizer.cpp 2014/01/26 19:36:28 200155
+@@ -396,7 +396,7 @@
+ isl_band_list_free(Children);
+ } else if (PollyVectorizerChoice != VECTORIZER_NONE) {
+ for (int j = 0; j < isl_band_n_member(Band); j++) {
+- if (isl_band_member_is_zero_distance(Band, j)) {
++ if (isl_band_member_is_coincident(Band, j)) {
+ isl_map *TileMap;
+ isl_union_map *TileUMap;
+
+@@ -514,8 +514,17 @@
+ isl_options_set_schedule_max_coefficient(S.getIslCtx(), MaxCoefficient);
+
+ isl_options_set_on_error(S.getIslCtx(), ISL_ON_ERROR_CONTINUE);
++
++ isl_schedule_constraints *ScheduleConstraints;
++ ScheduleConstraints = isl_schedule_constraints_on_domain(Domain);
++ ScheduleConstraints =
++ isl_schedule_constraints_set_proximity(ScheduleConstraints, Proximity);
++ ScheduleConstraints = isl_schedule_constraints_set_validity(
++ ScheduleConstraints, isl_union_map_copy(Validity));
++ ScheduleConstraints =
++ isl_schedule_constraints_set_coincidence(ScheduleConstraints, Validity);
+ isl_schedule *Schedule;
+- Schedule = isl_union_set_compute_schedule(Domain, Validity, Proximity);
++ Schedule = isl_schedule_constraints_compute_schedule(ScheduleConstraints);
+ isl_options_set_on_error(S.getIslCtx(), ISL_ON_ERROR_ABORT);
+
+ // In cases the scheduler is not able to optimize the code, we just do not
+--- a/tools/polly/lib/CodeGen/IslCodeGeneration.cpp 2014/01/26 18:51:00 200154
++++ b/tools/polly/lib/CodeGen/IslCodeGeneration.cpp 2014/01/26 19:36:28 200155
+@@ -445,6 +445,8 @@
+ case isl_ast_op_and_then:
+ case isl_ast_op_or_else:
+ case isl_ast_op_call:
++ case isl_ast_op_member:
++ case isl_ast_op_access:
+ llvm_unreachable("Unsupported isl ast expression");
+ case isl_ast_op_max:
+ case isl_ast_op_min:
+--- a/tools/polly/lib/CodeGen/CodeGeneration.cpp 2014/01/19 11:28:24 199584
++++ b/tools/polly/lib/CodeGen/CodeGeneration.cpp 2014/01/19 11:31:23 199585
+@@ -801,7 +801,7 @@
+ int NumberOfIterations = polly::getNumberOfIterations(LoopDomain);
+ if (NumberOfIterations == -1)
+ return -1;
+- return NumberOfIterations / isl_int_get_si(For->stride) + 1;
++ return NumberOfIterations / mpz_get_si(For->stride) + 1;
+ }
+
+ void ClastStmtCodeGen::codegenForVector(const clast_for *F) {
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-05-28 04:53:02 UTC (rev 120439)
@@ -6,6 +6,7 @@
set llvm_version 3.5
set llvm_version_no_dot 35
+revision 1
name llvm-${llvm_version}
subport clang-${llvm_version} {}
set suffix mp-${llvm_version}
@@ -43,7 +44,7 @@
library to parse C/C++ code.
depends_lib port:llvm-${llvm_version} port:libffi
- depends_run port:clang_select port:ld64
+ depends_run port:clang_select port:ld64 port:python27
depends_extract bin:svn:subversion
depends_build port:cctools
depends_skip_archcheck-append cctools ld64 subversion
@@ -57,7 +58,6 @@
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
version ${llvm_version}-r${svn.revision}
-revision 0
worksrcdir trunk
svn.url http://llvm.org/svn/llvm-project/llvm/trunk
#worksrcdir release_${llvm_version_no_dot}
@@ -88,6 +88,7 @@
if {${subport} == "clang-${llvm_version}"} {
patchfiles-append scan-build-PR-35006.patch \
0001-Comment-out-SL-cctools-workaround.patch \
+ clang-format.patch \
snowleopard-cmath.patch
build.target clang-only
@@ -315,45 +316,15 @@
default_variants-append +arm_runtime
}
- set pythonver ""
- set pythonverdot ""
-
- if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants-append +python27
- }
-
- variant python25 conflicts python26 python27 description {Use python 2.5} {
- set pythonver 25
- set pythonverdot 2.5
- configure.args-append --with-python=${prefix}/bin/python2.5
- }
-
- variant python26 conflicts python25 python27 description {Use python 2.6} {
- set pythonver 26
- set pythonverdot 2.6
- configure.args-append --with-python=${prefix}/bin/python2.6
- }
-
- variant python27 conflicts python25 python26 description {Use python 2.7} {
- set pythonver 27
- set pythonverdot 2.7
- configure.args-append --with-python=${prefix}/bin/python2.7
- }
-
variant analyzer description {Install clang static analyzer} {
- if {[string equal "${pythonver}" ""]} {
- ui_error "You must select a python variant to use the clang static analyzer (+analyzer)"
- error "Invalid variant combination"
- }
+ depends_run-append port:perl5
- depends_run-append port:perl5 port:python${pythonver}
-
post-patch {
reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/scan-build
- reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
+ reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/scan-view
}
@@ -378,6 +349,27 @@
reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/scan-view-${suffix}"
}
}
+
+
+ post-patch {
+ reinplace "s|@CLANG_FORMAT_PATH@|${prefix}/bin/clang-format-${suffix}|g" \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-bbedit.applescript \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-diff.py \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format-sublime.py \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format.el \
+ ${worksrcpath}/tools/clang/tools/clang-format/clang-format.py
+ }
+
+ post-destroot {
+ file mkdir ${destroot}${sub_prefix}/libexec
+ file copy ${worksrcpath}/tools/clang/tools/clang-format ${destroot}${sub_prefix}/libexec/clang-format
+
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/.svn
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Makefile
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Release+Debug+Asserts
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/CMakeLists.txt
+ file delete -force ${destroot}${sub_prefix}/libexec/clang-format/ClangFormat.cpp
+ }
}
livecheck.type none
Added: trunk/dports/lang/llvm-3.5/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/clang-format.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/clang-format.patch 2014-05-28 04:53:02 UTC (rev 120439)
@@ -0,0 +1,70 @@
+--- a/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2012-04-20 10:09:40.000000000 -0700
+@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
+ 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
+--- a/tools/clang/tools/clang-format/clang-format-diff.py 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-diff.py 2012-04-20 10:09:40.000000000 -0700
+@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
+
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+
+ def main():
+
+--- a/tools/clang/tools/clang-format/clang-format.el 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format.el 2012-04-20 10:09:40.000000000 -0700
+@@ -13,7 +13,7 @@ ifeq ($(HOST_OS),Darwin)
+
+ ;; *Location of the clang-format binary. If it is on your PATH, a full path name
+ ;; need not be specified.
+-(defvar clang-format-binary "clang-format")
++(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
+
+ (defun clang-format-region ()
+ "Use clang-format to format the currently active region."
+--- a/tools/clang/tools/clang-format/clang-format.py 2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format.py 2012-04-20 10:09:40.000000000 -0700
+@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),Darwin)
+ import vim
+
+ # 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
+
+--- a/tools/clang/tools/clang-format/clang-format-sublime.py2011-07-09 14:35:58.000000000 -0700
++++ b/tools/clang/tools/clang-format/clang-format-sublime.py 2012-04-20 10:09:40.000000000 -0700
+@@ -18,7 +18,7 @@ ifeq ($(HOST_OS),Darwin)
+ 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
+--- a/Makefile 2013-10-02 08:42:23.000000000 -0700
++++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
+@@ -70,8 +70,9 @@ 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/runtime tools/clang/docs \
+- tools/clang/include tools/clang/lib
++ tools/clang/include tools/clang/lib \
++ tools/clang/tools/clang-format
+ OPTIONAL_DIRS :=
+ NO_INSTALL = 1
+ endif
Modified: trunk/dports/lang/llvm-3.5/files/mp-clang-3.5
===================================================================
--- trunk/dports/lang/llvm-3.5/files/mp-clang-3.5 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.5/files/mp-clang-3.5 2014-05-28 04:53:02 UTC (rev 120439)
@@ -1,5 +1,7 @@
-
bin/clang++-mp-3.5
bin/clang-mp-3.5
+bin/clang-format-mp-3.5
+-
bin/scan-build-mp-3.5
bin/scan-view-mp-3.5
Modified: trunk/dports/lang/llvm-3.5/files/mp-llvm-3.5
===================================================================
--- trunk/dports/lang/llvm-3.5/files/mp-llvm-3.5 2014-05-28 04:52:27 UTC (rev 120438)
+++ trunk/dports/lang/llvm-3.5/files/mp-llvm-3.5 2014-05-28 04:53:02 UTC (rev 120439)
@@ -13,6 +13,7 @@
-
bin/llvm-link-mp-3.5
bin/llvm-mc-mp-3.5
+bin/llvm-mcmarkup-mp-3.5
bin/llvm-nm-mp-3.5
bin/llvm-objdump-mp-3.5
-
@@ -20,6 +21,8 @@
bin/llvm-rtdyld-mp-3.5
bin/llvm-size-mp-3.5
-
+bin/llvm-stress-mp-3.5
+bin/llvm-symbolizer-mp-3.5
bin/llvm-tblgen-mp-3.5
-
bin/macho-dump-mp-3.5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140527/0e5cff53/attachment-0001.html>
More information about the macports-changes
mailing list