[130086] trunk/dports/lang
larryv at macports.org
larryv at macports.org
Fri Dec 26 17:31:54 PST 2014
Revision: 130086
https://trac.macports.org/changeset/130086
Author: larryv at macports.org
Date: 2014-12-26 17:31:54 -0800 (Fri, 26 Dec 2014)
Log Message:
-----------
llvm-3.{4,5,6}: Skip Python configure check
LLVM only uses Python for testing, and we don't run or install the
tests, but the configure script still fails if it can't detect
a suitable Python (#32575, #42051, #46321).
Modified Paths:
--------------
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.4/files/skip-python-check.patch
trunk/dports/lang/llvm-3.5/files/skip-python-check.patch
trunk/dports/lang/llvm-3.6/files/skip-python-check.patch
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2014-12-26 20:58:00 UTC (rev 130085)
+++ trunk/dports/lang/llvm-3.4/Portfile 2014-12-27 01:31:54 UTC (rev 130086)
@@ -112,7 +112,12 @@
patch.pre_args -p1
-if {${subport} eq "clang-${llvm_version}"} {
+if {${subport} eq "llvm-${llvm_version}"} {
+ # Prevent configure from failing if an acceptable Python is not
+ # found (#32575, #42051, #46321). Python is only used for testing,
+ # and we don't run or install the tests.
+ patchfiles-append skip-python-check.patch
+} elseif {${subport} eq "clang-${llvm_version}"} {
patchfiles-append move-clang-resources.patch \
fix-clang-dylib-ids.patch \
tiger-libclang.patch \
Added: trunk/dports/lang/llvm-3.4/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/skip-python-check.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/skip-python-check.patch 2014-12-27 01:31:54 UTC (rev 130086)
@@ -0,0 +1,98 @@
+Index: llvm-3.4.2.src/configure
+===================================================================
+--- llvm-3.4.2.src.orig/configure
++++ llvm-3.4.2.src/configure
+@@ -11769,93 +11769,6 @@ fi
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
+
+
+-# Check whether --with-python was given.
+-if test "${with_python+set}" = set; then
+- withval=$with_python; PYTHON="$withval"
+-fi
+-
+-
+-if test -n "$PYTHON" && test -x "$PYTHON" ; then
+- { echo "$as_me:$LINENO: checking for python" >&5
+-echo $ECHO_N "checking for python... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
+-echo "${ECHO_T}user defined: $with_python" >&6; }
+-else
+- if test -n "$PYTHON" ; then
+- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
+-echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
+- fi
+-
+- # Extract the first word of "python python2 python26", so it can be a program name with args.
+-set dummy python python2 python26; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PYTHON in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
+-echo "$as_me: error: could not find python 2.5 or higher" >&2;}
+- { (exit 1); exit 1; }; }"
+- ;;
+-esac
+-fi
+-PYTHON=$ac_cv_path_PYTHON
+-if test -n "$PYTHON"; then
+- { echo "$as_me:$LINENO: result: $PYTHON" >&5
+-echo "${ECHO_T}$PYTHON" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-fi
+-
+-{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
+-echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
+-ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
+-ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
+-ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
+-ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
+-if test "$ac_python_version_major" -gt "2" || \
+- (test "$ac_python_version_major" -eq "2" && \
+- test "$ac_python_version_minor" -ge "5") ; then
+- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
+-echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+ { echo "$as_me:$LINENO: checking for sin in -lm" >&5
+ echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sin+set}" = set; then
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2014-12-26 20:58:00 UTC (rev 130085)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-12-27 01:31:54 UTC (rev 130086)
@@ -118,7 +118,12 @@
patch.pre_args -p1
-if {${subport} eq "clang-${llvm_version}"} {
+if {${subport} eq "llvm-${llvm_version}"} {
+ # Prevent configure from failing if an acceptable Python is not
+ # found (#32575, #42051, #46321). Python is only used for testing,
+ # and we don't run or install the tests.
+ patchfiles-append skip-python-check.patch
+} elseif {${subport} eq "clang-${llvm_version}"} {
patchfiles-append scan-build-PR-35006.patch \
0001-PR21536-Fix-a-corner-case-where-we-d-get-confused-by.patch \
0002-PR19372-Keep-checking-template-arguments-after-we-se.patch \
Added: trunk/dports/lang/llvm-3.5/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/skip-python-check.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/skip-python-check.patch 2014-12-27 01:31:54 UTC (rev 130086)
@@ -0,0 +1,98 @@
+Index: llvm-3.5.0.src/configure
+===================================================================
+--- llvm-3.5.0.src.orig/configure
++++ llvm-3.5.0.src/configure
+@@ -8176,93 +8176,6 @@ fi
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
+
+
+-# Check whether --with-python was given.
+-if test "${with_python+set}" = set; then
+- withval=$with_python; PYTHON="$withval"
+-fi
+-
+-
+-if test -n "$PYTHON" && test -x "$PYTHON" ; then
+- { echo "$as_me:$LINENO: checking for python" >&5
+-echo $ECHO_N "checking for python... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
+-echo "${ECHO_T}user defined: $with_python" >&6; }
+-else
+- if test -n "$PYTHON" ; then
+- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
+-echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
+- fi
+-
+- # Extract the first word of "python python2 python26", so it can be a program name with args.
+-set dummy python python2 python26; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PYTHON in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
+-echo "$as_me: error: could not find python 2.5 or higher" >&2;}
+- { (exit 1); exit 1; }; }"
+- ;;
+-esac
+-fi
+-PYTHON=$ac_cv_path_PYTHON
+-if test -n "$PYTHON"; then
+- { echo "$as_me:$LINENO: result: $PYTHON" >&5
+-echo "${ECHO_T}$PYTHON" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-fi
+-
+-{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
+-echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
+-ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
+-ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
+-ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
+-ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
+-if test "$ac_python_version_major" -gt "2" || \
+- (test "$ac_python_version_major" -eq "2" && \
+- test "$ac_python_version_minor" -ge "5") ; then
+- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
+-echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+ { echo "$as_me:$LINENO: checking for sin in -lm" >&5
+ echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sin+set}" = set; then
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2014-12-26 20:58:00 UTC (rev 130085)
+++ trunk/dports/lang/llvm-3.6/Portfile 2014-12-27 01:31:54 UTC (rev 130086)
@@ -98,7 +98,12 @@
patch.pre_args -p1
-if {${subport} eq "clang-${llvm_version}"} {
+if {${subport} eq "llvm-${llvm_version}"} {
+ # Prevent configure from failing if an acceptable Python is not
+ # found (#32575, #42051, #46321). Python is only used for testing,
+ # and we don't run or install the tests.
+ patchfiles-append skip-python-check.patch
+} elseif {${subport} eq "clang-${llvm_version}"} {
patchfiles-append scan-build-PR-35006.patch \
0001-Comment-out-SL-cctools-workaround.patch \
clang-format.patch \
Added: trunk/dports/lang/llvm-3.6/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/skip-python-check.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/skip-python-check.patch 2014-12-27 01:31:54 UTC (rev 130086)
@@ -0,0 +1,98 @@
+diff --git a/configure b/configure
+index b8cb1e2..b6ef26f 100755
+--- a/configure
++++ b/configure
+@@ -8142,93 +8142,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&6; }
+
+
+-# Check whether --with-python was given.
+-if test "${with_python+set}" = set; then
+- withval=$with_python; PYTHON="$withval"
+-fi
+-
+-
+-if test -n "$PYTHON" && test -x "$PYTHON" ; then
+- { echo "$as_me:$LINENO: checking for python" >&5
+-echo $ECHO_N "checking for python... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
+-echo "${ECHO_T}user defined: $with_python" >&6; }
+-else
+- if test -n "$PYTHON" ; then
+- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
+-echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
+- fi
+-
+- # Extract the first word of "python python2 python27", so it can be a program name with args.
+-set dummy python python2 python27; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PYTHON in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: could not find python 2.7 or higher" >&5
+-echo "$as_me: error: could not find python 2.7 or higher" >&2;}
+- { (exit 1); exit 1; }; }"
+- ;;
+-esac
+-fi
+-PYTHON=$ac_cv_path_PYTHON
+-if test -n "$PYTHON"; then
+- { echo "$as_me:$LINENO: result: $PYTHON" >&5
+-echo "${ECHO_T}$PYTHON" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-fi
+-
+-{ echo "$as_me:$LINENO: checking for python >= 2.7" >&5
+-echo $ECHO_N "checking for python >= 2.7... $ECHO_C" >&6; }
+-ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
+-ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
+-ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
+-ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
+-if test "$ac_python_version_major" -gt "2" || \
+- (test "$ac_python_version_major" -eq "2" && \
+- test "$ac_python_version_minor" -ge "7") ; then
+- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
+-echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.7
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+ { echo "$as_me:$LINENO: checking for sin in -lm" >&5
+ echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sin+set}" = set; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141226/e4f1a02d/attachment-0001.html>
More information about the macports-changes
mailing list