nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua-cjson: add host build support

Browse Source
This commit is contained in:
Matthias Schiffer 2015-12-30 01:02:59 +01:00
parent 289f58d5b9
commit 97471a1bb7
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/openwrt/0046-lua-fix-installation-of-headers-for-host-build.patch Normal file
View File

@ -0,0 +1,16 @@
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 29 Dec 2015 22:48:52 +0100
Subject: lua: fix installation of headers for host build
diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index 72d5631..c37d99b 100644
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -140,6 +140,7 @@ define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) \
INSTALL_TOP="$(STAGING_DIR_HOST)" \
install
+ $(CP) $(HOST_BUILD_DIR)/src/lnum_config.h $(STAGING_DIR_HOST)/include/
endef
define Build/InstallDev

32
patches/packages/openwrt/0003-lua-cjson-add-host-build-support.patch Normal file
View File

@ -0,0 +1,32 @@
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 30 Dec 2015 01:00:49 +0100
Subject: lua-cjson: add host build support
diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile
index fd489f2..90c8f98 100644
--- a/lang/lua-cjson/Makefile
+++ b/lang/lua-cjson/Makefile
@@ -20,6 +20,7 @@ PKG_MD5SUM:=24f270663e9f6ca8ba2a02cef19f7963
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
@@ -39,6 +40,9 @@ endef
CMAKE_OPTIONS += \
-DUSE_LUA=ON
+CMAKE_HOST_OPTIONS += \
+ -DLUA_MATH_LIBRARY=m
+
define Package/lua-cjson/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/cjson.so $(1)/usr/lib/lua/
@@ -47,4 +51,5 @@ define Package/lua-cjson/install
$(INSTALL_DATA) $(PKG_BUILD_DIR)/lua/cjson/util.lua $(1)/usr/lib/lua/cjson
endef
+$(eval $(call HostBuild))
$(eval $(call BuildPackage,lua-cjson))