[openwrt/openwrt] libjson-c: disable libbsd

LEDE Commits lede-commits at lists.infradead.org
Mon Jul 4 11:43:38 PDT 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/341121edd49428acb992ce34b27e51454ca904cf

commit 341121edd49428acb992ce34b27e51454ca904cf
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Mon Jul 4 00:56:19 2022 -0700

    libjson-c: disable libbsd
    
    libjson-c is happy to pick up libbsd both on the host and target.
    Reproducible with
    
    make package/libbsd/compile;make package/libjson-c/compile
    
    Also fixes host compilation on Arch Linux for a similar reason.
    Undefined reference to arc4random.
    
    Fixes: f3a198697f60 ("libjson-c: update to 0.16")
    Acked-by: Thomas Huehn thomas.huehn at hs-nordhausen.de
    Acked-by: Nick Hainke vincent at systemli.org
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 package/libs/libjson-c/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
index 2b90c27a4a..2c312f200e 100644
--- a/package/libs/libjson-c/Makefile
+++ b/package/libs/libjson-c/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=json-c
 PKG_VERSION:=0.16
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
 PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
@@ -27,8 +27,12 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_HOST_OPTIONS += \
+	-DDISABLE_EXTRA_LIBS=TRUE \
 	-DBUILD_SHARED_LIBS=FALSE
 
+CMAKE_OPTIONS += \
+	-DDISABLE_EXTRA_LIBS=TRUE
+
 define Package/libjson-c
   SECTION:=libs
   CATEGORY:=Libraries




More information about the lede-commits mailing list