From abdbf50221d3052dd8c2372c09c9e5079f11a18b Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 20 Jun 2018 21:59:01 +0200 Subject: [PATCH] ola: update to 0.10.6, fix build with recent protobuf Recent protobuf requires C++11 while OLA was forcing C++98 in order to keep using auto_ptr without getting warnings... Use gnu++11 to make everyone happy and live with the warnings about auto_ptr being deprecated. Signed-off-by: Daniel Golle --- net/ola/Makefile | 8 +++---- .../patches/050-always-force-gnu++11.patch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 net/ola/patches/050-always-force-gnu++11.patch diff --git a/net/ola/Makefile b/net/ola/Makefile index eca389d6ba..75016d083d 100644 --- a/net/ola/Makefile +++ b/net/ola/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ola -PKG_VERSION:=0.10.5 -PKG_RELEASE:=2 +PKG_VERSION:=0.10.6 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OpenLightingProject/ola.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=32db3c49d435398d017c6b5c0b25e02a7a831f5c +PKG_SOURCE_VERSION:=6e57342c414a72cdd721e8df5bc7967e17459647 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=11ed6540bd667c1662d91de93a260a9a63a98725851f768647e2b9b2efe1ae34 +PKG_MIRROR_HASH:=c1f36eaedcd9711e42fd362ff84d8e66eb40bc6af97de77129a5074d05fb9936 PKG_LICENSE:=LGPL-2.1+ PKG_FIXUP:=libtool diff --git a/net/ola/patches/050-always-force-gnu++11.patch b/net/ola/patches/050-always-force-gnu++11.patch new file mode 100644 index 0000000000..2e0f396baa --- /dev/null +++ b/net/ola/patches/050-always-force-gnu++11.patch @@ -0,0 +1,21 @@ +Index: ola-0.10.6/configure.ac +=================================================================== +--- ola-0.10.6.orig/configure.ac ++++ ola-0.10.6/configure.ac +@@ -72,8 +72,6 @@ AM_CONDITIONAL([SUPPORTS_GNU_PLUS_PLUS_1 + 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$enable_unittests" = xno], +- [CXXFLAGS="$CXXFLAGS -std=gnu++98"], + [PKG_CHECK_MODULES([CPPUNIT1], [cppunit < 1.14.0], + [CXXFLAGS="$CXXFLAGS -std=gnu++98"], + [PKG_CHECK_MODULES([CPPUNIT2], [cppunit >= 1.14.0], +@@ -81,7 +79,6 @@ AS_IF([test "x$ac_cv_gnu_plus_plus_11" = + [AC_MSG_WARN([OLA requires std::auto_ptr support.])]) + ]) + ]) +- ]) + ]) + AS_IF([test "x$require_gnu_plus_plus_11" = xyes], + [CXXFLAGS="$CXXFLAGS -std=gnu++11"]) -- 2.30.2