ola: update to 0.10.9
Use local tarballs instead of codeload. Smaller size. Patch ola.m4 to support statically linked protobuf. Avoids rpath hacks. Remove upstream backport. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
d24229e441
commit
7be4cc6411
|
@ -9,12 +9,13 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=ola
|
PKG_NAME:=ola
|
||||||
PKG_VERSION:=0.10.8
|
PKG_VERSION:=0.10.9
|
||||||
PKG_RELEASE:=4
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/OpenLightingProject/ola/tar.gz/$(PKG_VERSION)?
|
PKG_SOURCE_VERSION:=$(PKG_VERSION)
|
||||||
PKG_HASH:=45bc101d1ddcc1c6320c063eb25a9345e5820a4233acfa5b29f2dfd99f7452e1
|
PKG_SOURCE_URL:=https://github.com/OpenLightingProject/ola
|
||||||
|
PKG_MIRROR_HASH:=55b9c82dec4133c3895a9af99a3245764ece14fc5b0a4e0841686903b1d6f365
|
||||||
|
|
||||||
PKG_MAINTAINER:=Christian Beier <dontmind@freeshell.org>
|
PKG_MAINTAINER:=Christian Beier <dontmind@freeshell.org>
|
||||||
PKG_LICENSE:=LGPL-2.1-or-later
|
PKG_LICENSE:=LGPL-2.1-or-later
|
||||||
|
@ -62,10 +63,8 @@ HOST_CONFIGURE_ARGS += \
|
||||||
--disable-examples \
|
--disable-examples \
|
||||||
--disable-unittests \
|
--disable-unittests \
|
||||||
--disable-doxygen-html \
|
--disable-doxygen-html \
|
||||||
--disable-doxygen-doc
|
--disable-doxygen-doc \
|
||||||
|
--with-protoc=$(STAGING_DIR_HOSTPKG)/bin/protoc
|
||||||
HOST_LDFLAGS += -Wl,-rpath$(comma)$(STAGING_DIR_HOSTPKG)/lib
|
|
||||||
TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lm)
|
|
||||||
|
|
||||||
# only build the ola_protoc thingy
|
# only build the ola_protoc thingy
|
||||||
define Host/Compile
|
define Host/Compile
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/config/ola.m4
|
||||||
|
+++ b/config/ola.m4
|
||||||
|
@@ -84,7 +84,7 @@ else
|
||||||
|
[],
|
||||||
|
AC_MSG_ERROR([Cannot find the protoc header files]))
|
||||||
|
SAVED_LIBS=$LIBS
|
||||||
|
- LIBS="$LIBS -lprotoc"
|
||||||
|
+ LIBS="$LIBS -lprotoc -lprotobuf"
|
||||||
|
AC_LINK_IFELSE(
|
||||||
|
[AC_LANG_PROGRAM([#include <google/protobuf/compiler/command_line_interface.h>],
|
||||||
|
[google::protobuf::compiler::CommandLineInterface cli])],
|
|
@ -1,56 +0,0 @@
|
||||||
https://github.com/OpenLightingProject/ola/commit/30fe936a885c8a364bdda507a692c8e259576621
|
|
||||||
|
|
||||||
From 30fe936a885c8a364bdda507a692c8e259576621 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Newman <peterjnewman@gmail.com>
|
|
||||||
Date: Mon, 13 Aug 2018 00:53:51 +0100
|
|
||||||
Subject: [PATCH] Extend configure so we switch to C++11 if necessary for
|
|
||||||
Protobuf 3.6 or above too
|
|
||||||
|
|
||||||
(cherry picked from commit 5286a6925f5f9dc1a045d13632d08cef7f818536)
|
|
||||||
---
|
|
||||||
configure.ac | 28 +++++++++++++++++-----------
|
|
||||||
1 file changed, 17 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -103,23 +103,29 @@ AS_IF([test "x$ac_cv_gnu_plus_plus_11" =
|
|
||||||
# force us into gnu++98 mode if necessary
|
|
||||||
# If gnu++11 and gnu++98 then
|
|
||||||
# If random works with gnu++98
|
|
||||||
-# If no unit tests, force to gnu++98
|
|
||||||
-# If unittests and cppunit < 1.14.0, force to gnu++98
|
|
||||||
-# Else turn off deprecation messages for std::auto_ptr and run gnu++11
|
|
||||||
-# Else run gnu++11
|
|
||||||
+# If protobuf < 3.6
|
|
||||||
+# If no unit tests, force to gnu++98
|
|
||||||
+# Else we have unit tests
|
|
||||||
+# If cppunit < 1.14.0, force to gnu++98
|
|
||||||
+# Else turn off deprecation messages for std::auto_ptr and run gnu++11
|
|
||||||
+# Else assume we have protobuf >= 3.6 (later checks will confirm that for certain), turn off deprecation messages for std::auto_ptr and run gnu++11
|
|
||||||
+# Else turn off deprecation messages for std::auto_ptr and run gnu++11
|
|
||||||
require_gnu_plus_plus_11="no"
|
|
||||||
AS_IF([test "x$ac_cv_gnu_plus_plus_11" = xyes],
|
|
||||||
[AS_IF([test "x$ac_cv_gnu_plus_plus_98" = xyes],
|
|
||||||
[AS_IF([test "x$ac_cv_header_random_98" = xyes],
|
|
||||||
- [AS_IF([test "x$enable_unittests" = xno],
|
|
||||||
- [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
|
|
||||||
- [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0],
|
|
||||||
+ [PKG_CHECK_MODULES([PROTOBUF1], [protobuf < 3.6],
|
|
||||||
+ [AS_IF([test "x$enable_unittests" = xno],
|
|
||||||
[CXXFLAGS="$CXXFLAGS -std=gnu++98"],
|
|
||||||
- [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0],
|
|
||||||
- [require_gnu_plus_plus_11="yes"],
|
|
||||||
- [AC_MSG_WARN([OLA requires std::auto_ptr support.])])
|
|
||||||
+ [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0],
|
|
||||||
+ [CXXFLAGS="$CXXFLAGS -std=gnu++98"],
|
|
||||||
+ [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0],
|
|
||||||
+ [require_gnu_plus_plus_11="yes"],
|
|
||||||
+ [AC_MSG_WARN([OLA requires std::auto_ptr support.])])
|
|
||||||
+ ])
|
|
||||||
])
|
|
||||||
- ])
|
|
||||||
+ ],
|
|
||||||
+ [require_gnu_plus_plus_11="yes"])
|
|
||||||
],
|
|
||||||
[require_gnu_plus_plus_11="yes"])
|
|
||||||
])
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -434,8 +434,7 @@ ACX_PTHREAD([
|
@@ -439,8 +439,7 @@ ACX_PTHREAD([
|
||||||
LIBS="$PTHREAD_LIBS $LIBS"
|
LIBS="$PTHREAD_LIBS $LIBS"
|
||||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||||
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
|
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
|
||||||
|
|
Loading…
Reference in New Issue