Skip to contentSkip to conversation

package/ola: bump to 0.8.33

PATCH New Yann E. MORIN 3 participants 4 messages Jan 14, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/2 package/ola: bump to 0.8.33

From: "Yann E. MORIN" <[email protected]>

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/ola/ola.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/ola/ola.mk +1 -1
index 542aa77..843ec0b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OLA_VERSION = 0.8.32
+OLA_VERSION = 0.8.33
 OLA_SITE = https://open-lighting.googlecode.com/files
 
 OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 2/2 package/ola: fix check for google.protobuf

From: "Yann E. MORIN" <[email protected]>

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" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
---
 .../ola-0002-fix-check-for-google.protobuf.patch   | 30 --------
 ...002-move-python-sub-check-to-configure.ac.patch | 48 +++++++++++++
 ...k-for-python-module-for-cross-compilation.patch | 81 ++++++++++++++++++++++
 package/ola/ola.mk                                 |  1 +
 4 files changed, 130 insertions(+), 30 deletions(-)
 delete mode 100644 package/ola/ola-0002-fix-check-for-google.protobuf.patch
 create mode 100644 package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch
 create mode 100644 package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch
package/ola/ola-0002-fix-check-for-google.protobuf.patch deleted +0 -30
deleted file mode 100644
index f0bc465..0000000
@@ -1,30 +0,0 @@
-configure: do not check for google.protobuf
-
-The check for google.protobuf is inherently flawed for cross-compilation,
-as it uses the host Python to check for target modules.
-
-In Buildroot, our dependencies ensures that google.protobuf is present
-by the time we configure and build ola, so we can just skip the test
-altogether.
-
-We don't need to fake the result of the test: it is used nowhere; the
-test is only here to fail or succeed.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN ola-0.8.32.orig/configure.ac ola-0.8.32/configure.ac
---- ola-0.8.32.orig/configure.ac	2013-09-29 19:46:48.000000000 +0200
-+++ ola-0.8.32/configure.ac	2014-01-09 19:43:55.342044336 +0100
-@@ -530,7 +530,11 @@
- 
- if test "${enable_python_libs}" = "yes"; then
-  AM_PATH_PYTHON(2.6)
-- AX_PYTHON_MODULE("google.protobuf", "fatal")
-+# AX_PYTHON_MODULE is inherently broken for cross-compilation
-+# since it executes the host Python to check for target modules.
-+# In Buildroot, we do not need to check for google.protobuf,
-+# since our dependencies ensure it is available.
-+# AX_PYTHON_MODULE("google.protobuf", "fatal")
- fi
- 
- # Maybe build the logic sniffer tools
package/ola/ola-0002-move-python-sub-check-to-configure.ac.patch new file +48 -0

48 lines not on this page · raw message

package/ola/ola-0003-fix-check-for-python-module-for-cross-compilation.patch new file +81 -0

81 lines not on this page · raw message

package/ola/ola.mk +1 -0
index 843ec0b..a503bc3 100644
@@ -18,6 +18,7 @@ OLA_AUTORECONF = YES
 OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex
 
 OLA_CONF_OPT = \
+	ac_cv_have_pymod_google_protobuf=yes \
 	--disable-gcov \
 	--disable-tcmalloc \
 	--disable-unittests \
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/2 package/ola: fix check for google.protobuf

Quoted 11 lines · Yann E. MORIN

From: "Yann E. MORIN"<[email protected]>

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"<[email protected]>
Cc Arnout Vandecappelle<[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout
[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F