summaryrefslogtreecommitdiffstats
path: root/package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2014-12-07 19:39:39 -0500
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-08 21:44:46 +0100
commit66056a5179ef49f2ec10ba5d7fbd1a58863d1350 (patch)
tree7fae4e2050b0937629b05107e4c7c57b482d6c17 /package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch
parentd3e89999711f3d3479488e1ac06f5353af8dc919 (diff)
downloadbuildroot-66056a5179ef49f2ec10ba5d7fbd1a58863d1350.tar.gz
buildroot-66056a5179ef49f2ec10ba5d7fbd1a58863d1350.zip
ola: bump to 0.9.3
This update requires a few changes. First, good news, the patches that you guys have submitted to OLA have been merged, so we can drop those: ola-0001-fix-build-warning.patch -> ea375582b0bfee93d66608ffc807078ffc48e961 ola-0002-move-python-sub-check-to-configure.ac.patch -> 673a7602a6bf7a6aa8a8461ebd9362d59f6e21df ola-0003-fix-check-for-python-module-for-cross-compilation.patch -> b51b48be81ec38bc7d1229be0c7d3189c5ddbafa Less good news: OLA now builds a small protoc wrapper (ola_protoc) that is built and executed at compile-time on the host. If we don't change anything, ola_protoc is built with the target toolchain and therefore can't run on the host. Explanation for ola_protoc is here To solve this, I created a package host-ola, which builds and provides an ola_protoc for the host. It tries to disable as much as possible of things that we won't need at configure time. Only ola_protoc is built and installed so it's not that long. The change has been built-tested only. [1] https://github.com/OpenLightingProject/ola/blob/master/protoc/ola-protoc.cpp#L20 [Thomas: - add HOST_OLA_DEPENDENCIES variable, so that host-ola doesn't get all the dependencies of the target ola package: certain target ola dependencies do not have corresponding host packages (and it doesn't make sense to have them as dependencies just to build ola_protoc) - improve the commit log to mention which upstream commits correspond to our patches.] Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch')
-rw-r--r--package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch b/package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch
deleted file mode 100644
index 436974d1ca..0000000000
--- a/package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit ea985068c2d699ffb5b353de090f7ded713c08a7
-Author: Yann E. MORIN <yann.morin.1998@free.fr>
-Date: Tue Jan 14 21:38:27 2014 +0100
-
- configure: add option for user to override checks for Python modules
-
- The check for google.protobuf is inherently flawed for cross-compilation,
- as it uses the host Python to check for target modules.
-
- In this case, it is not possible to check for a Pyhon modules altogether,
- and we need to rely on the user to properly tell us whether we do or do
- not have google.protobuf.
-
- This is done by adding am autoconf cache variable:
- ac_cv_have_pymod_google_protobuf
-
- which can be set to:
- - yes : force the test to be true
- - no : force the test to be false
- - (empty) : let the test decide
-
- This is then used in AX_PYTHON_MODULE to override the test.
-
- Currently, only the google.protobuf Python module is checked for, but
- the same could be done later on of other Python modules that may be
- added in the future, of course.
-
- Fixes configure-errors like:
- http://autobuild.buildroot.net/results/e63/e634d5f0cee3967caffaa6e7ada8c0968e3eff63/build-end.log
-
- Also fixes some under-quotation in the python module check.
-
- 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 96dd1ab..2910e88 100644
---- a/config/ax_python_module.m4
-+++ b/config/ax_python_module.m4
-@@ -25,20 +25,17 @@
-
- AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
- AC_DEFUN([AX_PYTHON_MODULE],[
-- AC_MSG_CHECKING($PYTHON_NAME module: $1)
- $PYTHON -c "import $1" 2>/dev/null
- if test $? -eq 0;
- then
-- AC_MSG_RESULT(yes)
-- eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
-+ eval AS_TR_CPP([HAVE_PYMOD_$1])=yes
- else
-- AC_MSG_RESULT(no)
-- eval AS_TR_CPP(HAVE_PYMOD_$1)=no
-+ eval AS_TR_CPP([HAVE_PYMOD_$1])=no
- #
- if test -n "$2"
- then
-- AC_MSG_ERROR(failed to find required module $1)
-- exit 1
-+ AC_MSG_ERROR([failed to find required module $1])
- fi
- fi
-+ AC_MSG_RESULT([AS_TR_CPP([HAVE_PYMOD_$1])])
- ])
-diff --git a/configure.ac b/configure.ac
-index 5f6f604..5994d06 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -534,7 +534,9 @@ if test "${enable_python_libs}" = "yes"; then
- PYTHON="python"
- fi
- PYTHON_NAME=`basename $PYTHON`
-- AX_PYTHON_MODULE("google.protobuf", "fatal")
-+ AC_CACHE_CHECK([$PYTHON_NAME module: google.protobuf],
-+ [ac_cv_have_pymod_google_protobuf],
-+ [AX_PYTHON_MODULE([google.protobuf], [fatal])])
- fi
-
- # Maybe build the logic sniffer tools
OpenPOWER on IntegriCloud