diff options
| -rw-r--r-- | oonf-dlep-proxy/Makefile | 17 | ||||
| -rw-r--r-- | oonf-dlep-proxy/patches/010-gcc10.patch | 30 |
2 files changed, 7 insertions, 40 deletions
diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 6a27005..d8dadac 100644 --- a/oonf-dlep-proxy/Makefile +++ b/oonf-dlep-proxy/Makefile @@ -1,16 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-proxy -PKG_VERSION:=v0.15.1 -PKG_REV:=bffb88b040659b237c4c91b6b42dbbb47431750e -PKG_RELEASE:=$(PKG_REV) +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_MIRROR_HASH:=a5413418b7ab1665758f883a652ff589de6a78ccf9201d29bc13f372cb9adeb0 +PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git +PKG_SOURCE_DATE:=2022-08-25 +PKG_SOURCE_VERSION:=fb15d54d6a7a087cb0c5ec37c49804f6ce432396 +PKG_MIRROR_HASH:=ad88fa237d2b04119fe2e94ef7ab73d9e6361c1e922fd3f9265ea04d9a653a76 CMAKE_INSTALL:=1 @@ -23,8 +20,8 @@ CMAKE_OPTIONS+=-D OONF_NO_WERROR:Bool=true \ -D UCI:Bool=true \ -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \ -D OONF_STATIC_PLUGINS:String="class;clock;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \ - -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \ - -D OONF_VERSION:String=$(PKG_VERSION) \ + -D OONF_LIB_GIT:String=v$(PKG_SOURCE_VERSION) \ + -D VERSION_SUB_TAG:String=$(PKG_SOURCE_DATE) \ -D INSTALL_LIB_DIR:Path=lib/oonf \ -D INSTALL_INCLUDE_DIR:Path=include/oonf \ -D INSTALL_CMAKE_DIR:Path=lib/oonf \ diff --git a/oonf-dlep-proxy/patches/010-gcc10.patch b/oonf-dlep-proxy/patches/010-gcc10.patch deleted file mode 100644 index c5415fd..0000000 --- a/oonf-dlep-proxy/patches/010-gcc10.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src-plugins/generic/dlep/radio/dlep_radio_internal.h -+++ b/src-plugins/generic/dlep/radio/dlep_radio_internal.h -@@ -49,6 +49,6 @@ - #include "core/oonf_logging.h" - - /* headers only for use inside the DLEP_RADIO subsystem */ --enum oonf_log_source LOG_DLEP_RADIO; -+extern enum oonf_log_source LOG_DLEP_RADIO; - - #endif /* DLEP_RADIO_INTERNAL_H_ */ ---- a/src-plugins/generic/dlep/router/dlep_router_internal.h -+++ b/src-plugins/generic/dlep/router/dlep_router_internal.h -@@ -49,6 +49,6 @@ - #include "core/oonf_logging.h" - - /* headers only for use inside the DLEP_ROUTER subsystem */ --enum oonf_log_source LOG_DLEP_ROUTER; -+extern enum oonf_log_source LOG_DLEP_ROUTER; - - #endif /* DLEP_ROUTER_INTERNAL_H_ */ ---- 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_ */ |