ola: replace gnu++11 patch with a configure var

Simpler.

Signed-off-by: Rosen Penev <redacted>

diff --git a/net/ola/Makefile b/net/ola/Makefile
index 5e436bac23a048859f967a7abedef48db5ca4659..322600b60ee57cc8f5e8043c3e4c02a90fc9e5b2 100644 (file)
--- a/net/ola/Makefile
+++ b/net/ola/Makefile
@@ -68,6 +68,9 @@ HOST_CONFIGURE_ARGS += \
 HOST_CPPFLAGS += \
        -std=gnu++11
 
+CONFIGURE_VARS += \
+       require_gnu_plus_plus_11=yes
+
 HOST_LDFLAGS += -Wl,-rpath="$(STAGING_DIR_HOSTPKG)/lib"
 TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lm)
 

diff --git a/net/ola/patches/050-always-force-gnu++11.patch b/net/ola/patches/050-always-force-gnu++11.patch
deleted file mode 100644 (file)
index 2e0f396..0000000
--- a/net/ola/patches/050-always-force-gnu++11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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"])