From 061630c354385e0589b3ed34d1ef92cf60a2cae4 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 5 Oct 2020 16:32:45 +0200 Subject: [PATCH] oonf-olsrd2: fix compiling Remove 010-gcc10.patch. Add "-fcommon" to stay compatible with gcc10. This should only be a temporary fix since it could introduce speed and code size penalty on global variable references. Signed-off-by: Nick Hainke --- oonf-olsrd2/Makefile | 2 +- oonf-olsrd2/patches/010-gcc10.patch | 40 ----------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 oonf-olsrd2/patches/010-gcc10.patch diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 474b0e4..8f8ef0f 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -71,7 +71,7 @@ define Build/Install $(INSTALL_BIN) -D $(PKG_BUILD_DIR)/$(MAKE_PATH)/olsrd2_static $(PKG_INSTALL_DIR)/usr/sbin/olsrd2; endef -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -I${STAGING_DIR}/usr/include/libnl-tiny +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -I${STAGING_DIR}/usr/include/libnl-tiny -fcommon define Package/oonf-olsrd2/install $(INSTALL_BIN) -D $(PKG_BUILD_DIR)/olsrd2_static $(1)/usr/sbin/olsrd2 diff --git a/oonf-olsrd2/patches/010-gcc10.patch b/oonf-olsrd2/patches/010-gcc10.patch deleted file mode 100644 index e0b141a..0000000 --- a/oonf-olsrd2/patches/010-gcc10.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src-plugins/generic/nl80211_listener/nl80211_internal.h -+++ b/src-plugins/generic/nl80211_listener/nl80211_internal.h -@@ -49,6 +49,6 @@ - #include "core/oonf_logging.h" - - /* headers only for use inside the NL80211 subsystem */ --enum oonf_log_source LOG_NL80211; -+extern enum oonf_log_source LOG_NL80211; - - #endif /* NL80211_INTERNAL_H_ */ ---- a/src-plugins/nhdp/nhdp/nhdp_internal.h -+++ b/src-plugins/nhdp/nhdp/nhdp_internal.h -@@ -49,8 +49,8 @@ - #include "core/oonf_logging.h" - - /* headers only for use inside the NHDP subsystem */ --enum oonf_log_source LOG_NHDP; --enum oonf_log_source LOG_NHDP_R; --enum oonf_log_source LOG_NHDP_W; -+extern enum oonf_log_source LOG_NHDP; -+extern enum oonf_log_source LOG_NHDP_R; -+extern enum oonf_log_source LOG_NHDP_W; - - #endif /* NHDP_INTERNAL_H_ */ ---- a/src-plugins/olsrv2/olsrv2/olsrv2_internal.h -+++ b/src-plugins/olsrv2/olsrv2/olsrv2_internal.h -@@ -50,9 +50,9 @@ - #include "core/oonf_logging.h" - - /* headers only for use inside the OLSRv2 subsystem */ --EXPORT enum oonf_log_source LOG_OLSRV2; --EXPORT enum oonf_log_source LOG_OLSRV2_R; --EXPORT enum oonf_log_source LOG_OLSRV2_ROUTING; --EXPORT enum oonf_log_source LOG_OLSRV2_W; -+EXPORT extern enum oonf_log_source LOG_OLSRV2; -+EXPORT extern enum oonf_log_source LOG_OLSRV2_R; -+EXPORT extern enum oonf_log_source LOG_OLSRV2_ROUTING; -+EXPORT extern enum oonf_log_source LOG_OLSRV2_W; - - #endif /* OLSRV2_INTERNAL_H_ */