[121556] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jun 29 16:59:33 PDT 2014
Revision: 121556
https://trac.macports.org/changeset/121556
Author: jeremyhu at macports.org
Date: 2014-06-29 16:59:33 -0700 (Sun, 29 Jun 2014)
Log Message:
-----------
llvm*: Fix some python-related build issues (#44188)
Modified Paths:
--------------
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-3.0/Portfile
trunk/dports/lang/llvm-3.1/Portfile
trunk/dports/lang/llvm-3.2/Portfile
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-3.5/Portfile
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-2.9/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -285,16 +285,19 @@
variant python25 conflicts python26 python27 description {Use python 2.5} {
set pythonver 25
set pythonverdot 2.5
+ depends_build-append port:python25
}
variant python26 conflicts python25 python27 description {Use python 2.6} {
set pythonver 26
set pythonverdot 2.6
+ depends_build-append port:python26
}
variant python27 conflicts python25 python26 description {Use python 2.7} {
set pythonver 27
set pythonverdot 2.7
+ depends_build-append port:python27
}
variant analyzer description {Install clang static analyzer} {
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-3.0/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -282,16 +282,19 @@
variant python25 conflicts python26 python27 description {Use python 2.5} {
set pythonver 25
set pythonverdot 2.5
+ depends_build-append port:python25
}
variant python26 conflicts python25 python27 description {Use python 2.6} {
set pythonver 26
set pythonverdot 2.6
+ depends_build-append port:python26
}
variant python27 conflicts python25 python26 description {Use python 2.7} {
set pythonver 27
set pythonverdot 2.7
+ depends_build-append port:python27
}
variant analyzer description {Install clang static analyzer} {
Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-3.1/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -286,16 +286,19 @@
variant python25 conflicts python26 python27 description {Use python 2.5} {
set pythonver 25
set pythonverdot 2.5
+ depends_build-append port:python25
}
variant python26 conflicts python25 python27 description {Use python 2.6} {
set pythonver 26
set pythonverdot 2.6
+ depends_build-append port:python26
}
variant python27 conflicts python25 python26 description {Use python 2.7} {
set pythonver 27
set pythonverdot 2.7
+ depends_build-append port:python27
}
variant analyzer description {Install clang static analyzer} {
Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-3.2/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -298,16 +298,19 @@
variant python25 conflicts python26 python27 description {Use python 2.5} {
set pythonver 25
set pythonverdot 2.5
+ depends_build-append port:python25
}
variant python26 conflicts python25 python27 description {Use python 2.6} {
set pythonver 26
set pythonverdot 2.6
+ depends_build-append port:python26
}
variant python27 conflicts python25 python26 description {Use python 2.7} {
set pythonver 27
set pythonverdot 2.7
+ depends_build-append port:python27
}
variant analyzer description {Install clang static analyzer} {
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-3.3/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -294,18 +294,21 @@
variant python25 conflicts python26 python27 description {Use python 2.5} {
set pythonver 25
set pythonverdot 2.5
+ depends_build-append port:python25
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
+ depends_build-append port:python26
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
+ depends_build-append port:python27
configure.args-append --with-python=${prefix}/bin/python2.7
}
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-3.4/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -6,7 +6,7 @@
set llvm_version 3.4
set llvm_version_no_dot 34
name llvm-${llvm_version}
-subport clang-${llvm_version} {}
+subport clang-${llvm_version} { revision 1 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -41,8 +41,8 @@
that can be built using the Clang frontend as a \
library to parse C/C++ code.
- depends_lib port:llvm-${llvm_version} port:libffi
- depends_run port:clang_select port:ld64 port:python27
+ depends_lib port:llvm-${llvm_version} port:libffi port:python27
+ depends_run port:clang_select port:ld64
depends_extract bin:svn:subversion
depends_build port:cctools
depends_skip_archcheck-append cctools ld64 subversion
@@ -132,6 +132,8 @@
} elseif {${subport} == "clang-${llvm_version}"} {
select.group clang
select.file ${filespath}/mp-${subport}
+
+ configure.args-append --with-python=${prefix}/bin/python2.7
}
# g++-4.0 fails to build some of the newer C++ for ppc
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2014-06-29 22:58:32 UTC (rev 121555)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-06-29 23:59:33 UTC (rev 121556)
@@ -7,7 +7,7 @@
set llvm_version 3.5
set llvm_version_no_dot 35
name llvm-${llvm_version}
-subport clang-${llvm_version} {}
+subport clang-${llvm_version} { revision 1 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -42,8 +42,8 @@
that can be built using the Clang frontend as a \
library to parse C/C++ code.
- depends_lib port:llvm-${llvm_version} port:libffi
- depends_run port:clang_select port:ld64 port:python27
+ depends_lib port:llvm-${llvm_version} port:libffi port:python27
+ depends_run port:clang_select port:ld64
depends_extract bin:svn:subversion
depends_build port:cctools
depends_skip_archcheck-append cctools ld64 subversion
@@ -113,6 +113,8 @@
} elseif {${subport} == "clang-${llvm_version}"} {
select.group clang
select.file ${filespath}/mp-${subport}
+
+ configure.args-append --with-python=${prefix}/bin/python27
}
# llvm-3.5 and later requires a C++11 runtime
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140629/0ca9abf4/attachment.html>
More information about the macports-changes
mailing list