diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-06-06 10:09:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 10:09:56 -0700 |
| commit | 9bf4d0f6b0b67b493cb84783f789804549441327 (patch) | |
| tree | 2dda3a9bdd6a8716de70392ed1eebae756821957 | |
| parent | 80499a2edfa7d26ff79303cdd9dafc8f6fc46205 (diff) | |
| parent | ae27b8af5e9459fa30c858f45ab97c24027084e3 (diff) | |
Merge pull request #12295 from neheb/ola2
ola: fix compilation with GCC4
| -rw-r--r-- | net/ola/Makefile | 3 | ||||
| -rw-r--r-- | net/ola/patches/050-always-force-gnu++11.patch | 21 |
2 files changed, 3 insertions, 21 deletions
diff --git a/net/ola/Makefile b/net/ola/Makefile index 5e436bac2..322600b60 100644 --- 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 index 2e0f396ba..000000000 --- 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"]) |