diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2014-12-07 19:39:39 -0500 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-08 21:44:46 +0100 |
commit | 66056a5179ef49f2ec10ba5d7fbd1a58863d1350 (patch) | |
tree | 7fae4e2050b0937629b05107e4c7c57b482d6c17 /package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch | |
parent | d3e89999711f3d3479488e1ac06f5353af8dc919 (diff) | |
download | buildroot-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-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, 0 insertions, 48 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 deleted file mode 100644 index 1a79035d33..0000000000 --- a/package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 - |