From c2623391bf42b105b8110625bb2a69687e5da2d7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 9 Jun 2021 19:34:27 +0200 Subject: [PATCH 1/2] lua-jsonc: do not link against liblua Linking against liblua requires a shared or PIC liblua, which isn't the case for host Lua. --- libs/lua-jsonc/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/lua-jsonc/src/CMakeLists.txt b/libs/lua-jsonc/src/CMakeLists.txt index d3a2c93..93090a5 100644 --- a/libs/lua-jsonc/src/CMakeLists.txt +++ b/libs/lua-jsonc/src/CMakeLists.txt @@ -4,7 +4,7 @@ project(lua-jsonc C) add_library(lua-jsonc SHARED lua-jsonc.c) set_property(TARGET lua-jsonc PROPERTY COMPILE_FLAGS "-Wall -std=c99") -target_link_libraries(lua-jsonc json-c lua) +target_link_libraries(lua-jsonc json-c) install(TARGETS lua-jsonc ARCHIVE DESTINATION lib From 64148a9baf14459c66f8a2677b8e516295d550be Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 9 Jun 2021 19:40:42 +0200 Subject: [PATCH 2/2] lua-jsonc: add host build support --- libs/lua-jsonc/Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libs/lua-jsonc/Makefile b/libs/lua-jsonc/Makefile index c89e2ec..1fee63d 100644 --- a/libs/lua-jsonc/Makefile +++ b/libs/lua-jsonc/Makefile @@ -4,7 +4,11 @@ PKG_NAME:=lua-jsonc PKG_VERSION:=1 CMAKE_INSTALL:=1 +HOST_BUILD_DEPENDS:=lua/host libjson-c/host +HOST_UNPACK:=true + include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk define Package/lua-jsonc @@ -19,4 +23,13 @@ define Package/lua-jsonc/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef +# For libjson-c +HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOST)/lib + +define Host/Install + $(INSTALL_DIR) $(1)/usr/lib/lua/5.1 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/liblua-jsonc.so $(1)/lib/lua/5.1/jsonc.so +endef + $(eval $(call BuildPackage,lua-jsonc)) +$(eval $(call HostBuild))