diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-01-14 22:36:05 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-01-14 23:36:59 +0100 |
| commit | e532033bff523b8175b31d60acb79910a7e507fd (patch) | |
| tree | 0abc2772ad3396e4c7da49ea54b6fc215c08e3e8 /package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch | |
| parent | 573aa4b95414b17805c51370e96e1a9c5fb3091c (diff) | |
| download | buildroot-e532033bff523b8175b31d60acb79910a7e507fd.tar.gz buildroot-e532033bff523b8175b31d60acb79910a7e507fd.zip | |
package/ola: fix check for google.protobuf
Fix the google.protobuf check in an upstreamable way.
As suggested by Arnout, use an autoconf ac_cv_have_* variable
so we can pass it on the command line. This is generic behaviour
for a lot of autoconf internals, so it makes sense to do it this
way.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch')
| -rw-r--r-- | package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch b/package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch new file mode 100644 index 0000000000..1a79035d33 --- /dev/null +++ b/package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch @@ -0,0 +1,48 @@ +commit 673a7602a6bf7a6aa8a8461ebd9362d59f6e21df +Author: Yann E. MORIN <yann.morin.1998@free.fr> +Date: Tue Jan 14 21:37:51 2014 +0100 + + configure: move python sub-check to configure.ac + + We do not want to re-test the python name for each Python module + we want to check for. + + Even if we only check for one Python module right now, this is + good practice overall. + + Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +--- +Sent upstream, awaiting for response... + +diff --git a/config/ax_python_module.m4 b/config/ax_python_module.m4 +index bd70a06..96dd1ab 100644 +--- a/config/ax_python_module.m4 ++++ b/config/ax_python_module.m4 +@@ -25,11 +25,6 @@ + + AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) + AC_DEFUN([AX_PYTHON_MODULE],[ +- if test -z $PYTHON; +- then +- PYTHON="python" +- fi +- PYTHON_NAME=`basename $PYTHON` + AC_MSG_CHECKING($PYTHON_NAME module: $1) + $PYTHON -c "import $1" 2>/dev/null + if test $? -eq 0; +diff --git a/configure.ac b/configure.ac +index 1efedf1..5f6f604 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -530,6 +530,10 @@ AM_CONDITIONAL(INSTALL_RDM_TESTS, test "${enable_rdm_tests}" = "yes") + + if test "${enable_python_libs}" = "yes"; then + AM_PATH_PYTHON(2.6) ++ if test -z $PYTHON; then ++ PYTHON="python" ++ fi ++ PYTHON_NAME=`basename $PYTHON` + AX_PYTHON_MODULE("google.protobuf", "fatal") + fi + |
