diff options
| author | Matija Amidzic <matija.amidzic@sartura.hr> | 2018-06-26 12:14:25 +0200 |
|---|---|---|
| committer | Matija Amidzic <matija.amidzic@sartura.hr> | 2018-07-02 13:37:32 +0200 |
| commit | e39d52d45ade6ee1b9317e3a269c094bf94ac995 (patch) | |
| tree | 40bfe487325243bd4f62bab2ee4121571fc235d0 /libs/libyang | |
| parent | d03e32c513187e041ab38ba20d1eaaf739197520 (diff) | |
libyang: update to 0.15.130
Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>
Diffstat (limited to 'libs/libyang')
| -rw-r--r-- | libs/libyang/Makefile | 11 | ||||
| -rw-r--r-- | libs/libyang/patches/001-fix-musl-issue.patch | 47 |
2 files changed, 7 insertions, 51 deletions
diff --git a/libs/libyang/Makefile b/libs/libyang/Makefile index 902951967..c0f8aad1a 100644 --- a/libs/libyang/Makefile +++ b/libs/libyang/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyang -PKG_VERSION:=0.14.53 +PKG_VERSION:=0.15.130 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_LICENSE:=GPL-2.0+ PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr> PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2698bd6484526facbf82b1263810b938b82a2f23 -PKG_MIRROR_HASH:=3bfe4fd8236f0d1903d275aa76e039645d1093ef4204ab3b9bef46aecbe68f72 +PKG_SOURCE_VERSION:=d6baaf90e24af3b07649e9dda6fc0d9b272b2ebc +PKG_MIRROR_HASH:=eace667ae787ac27b7c717a52f672d05e55608c47d9e54d39d60f8ab5e47f0c9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/CESNET/libyang.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) @@ -73,7 +73,10 @@ define Package/libyang/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyang.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/libyang - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyang/* $(1)/usr/lib/libyang/ + $(INSTALL_DIR) $(1)/usr/lib/libyang/extensions + $(INSTALL_DIR) $(1)/usr/lib/libyang/user_types + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyang/extensions/* $(1)/usr/lib/libyang/extensions + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyang/user_types/* $(1)/usr/lib/libyang/user_types endef define Package/yanglint/install diff --git a/libs/libyang/patches/001-fix-musl-issue.patch b/libs/libyang/patches/001-fix-musl-issue.patch deleted file mode 100644 index b497c9d16..000000000 --- a/libs/libyang/patches/001-fix-musl-issue.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23/src/extensions.c -=================================================================== ---- libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23.orig/src/extensions.c -+++ libyang-0.14.53-2698bd6484526facbf82b1263810b938b82a2f23/src/extensions.c -@@ -123,11 +123,14 @@ lyext_load_plugins(void) - - /* and construct the filepath */ - asprintf(&str, "%s/%s", pluginsdir, file->d_name); -- -- /* load the plugin - first, try if it is already loaded... */ -- dlhandler = dlopen(str, RTLD_NOW | RTLD_NOLOAD); -- dlerror(); /* Clear any existing error */ -- if (dlhandler) { -+ /* load the plugin */ -+ dlhandler = dlopen(str, RTLD_NOW); -+ if (!dlhandler) { -+ LOGERR(LY_ESYS, "Loading \"%s\" as a plugin failed (%s).", str, dlerror()); -+ free(str); -+ continue; -+ } -+ if (ly_set_contains(&dlhandlers, dlhandler) != -1) { - /* the plugin is already loaded */ - LOGVRB("Extension plugin \"%s\" already loaded.", str); - free(str); -@@ -137,14 +140,6 @@ lyext_load_plugins(void) - continue; - } - -- /* ... and if not, load it */ -- dlhandler = dlopen(str, RTLD_NOW); -- if (!dlhandler) { -- LOGERR(LY_ESYS, "Loading \"%s\" as an extension plugin failed (%s).", str, dlerror()); -- free(str); -- continue; -- } -- LOGVRB("Extension plugin \"%s\" successfully loaded.", str); - free(str); - dlerror(); /* Clear any existing error */ - -@@ -156,6 +151,7 @@ lyext_load_plugins(void) - dlclose(dlhandler); - continue; - } -+ LOGVRB("Plugin \"%s\" successfully loaded.", str) - - for(u = 0; plugin[u].name; u++) { - /* check extension implementations for collisions */ |