[128634] trunk/dports/lang/llvm-3.6
jeremyhu at macports.org
jeremyhu at macports.org
Mon Nov 24 12:37:10 PST 2014
Revision: 128634
https://trac.macports.org/changeset/128634
Author: jeremyhu at macports.org
Date: 2014-11-24 12:37:09 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
{clang,llvm}-3.6: Bump to trunk r222672
Revision Links:
--------------
https://trac.macports.org/changeset/222672
Modified Paths:
--------------
trunk/dports/lang/llvm-3.6/Portfile
trunk/dports/lang/llvm-3.6/files/clang-format.patch
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2014-11-24 20:29:44 UTC (rev 128633)
+++ trunk/dports/lang/llvm-3.6/Portfile 2014-11-24 20:37:09 UTC (rev 128634)
@@ -58,7 +58,7 @@
}
fetch.type svn
-svn.revision 216817
+svn.revision 222672
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
Modified: trunk/dports/lang/llvm-3.6/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/clang-format.patch 2014-11-24 20:29:44 UTC (rev 128633)
+++ trunk/dports/lang/llvm-3.6/files/clang-format.patch 2014-11-24 20:37:09 UTC (rev 128634)
@@ -1,6 +1,20 @@
---- 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)
+diff -Naurp trunk.orig/Makefile trunk/Makefile
+--- trunk.orig/Makefile 2014-11-24 11:32:24.000000000 -0800
++++ trunk/Makefile 2014-11-24 11:34:41.000000000 -0800
+@@ -71,7 +71,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
+ 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
+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+--- trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:34:41.000000000 -0800
+@@ -15,7 +15,7 @@ tell application "BBEdit"
end tell
set filePath to urlToPOSIXPath(fileURL)
@@ -9,9 +23,10 @@
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)
+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py trunk/tools/clang/tools/clang-format/clang-format-diff.py
+--- trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:34:41.000000000 -0800
+@@ -32,7 +32,7 @@ import sys
# Change this to the full path if clang-format is not on the path.
@@ -20,11 +35,23 @@
def main():
+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py trunk/tools/clang/tools/clang-format/clang-format-sublime.py
+--- trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:34:41.000000000 -0800
+@@ -18,7 +18,7 @@ import sublime_plugin
+ import subprocess
---- 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)
+ # 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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.el trunk/tools/clang/tools/clang-format/clang-format.el
+--- trunk.orig/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:34:41.000000000 -0800
+@@ -13,7 +13,7 @@
+
;; *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")
@@ -32,39 +59,15 @@
(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
+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.py trunk/tools/clang/tools/clang-format/clang-format.py
+--- trunk.orig/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:35:39.000000000 -0800
+@@ -25,7 +25,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')
- # 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141124/477c22a3/attachment.html>
More information about the macports-changes
mailing list