OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #12295 from neheb/ola2 

ola: fix compilation with GCC4
pull/12388/head
Rosen Penev 2020-06-06 10:09:56 -07:00 committed by GitHub
parent 80499a2edf ae27b8af5e
commit 9bf4d0f6b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ola/Makefile
View File

@ -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)

21
net/ola/patches/050-always-force-gnu++11.patch
View File

@ -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"])