Explorar el Código

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 [email protected]
Acked-by: Nick Hainke [email protected]
Signed-off-by: Rosen Penev <[email protected]>
Rosen Penev hace 3 años
padre
commit
341121edd4
Se han modificado 1 ficheros con 5 adiciones y 1 borrados
  1. 5 1
      package/libs/libjson-c/Makefile

+ 5 - 1
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