Merge pull request #288 from MikePetullo/master

luaexpat: update to 1.3.0
This commit is contained in:
sbyx 2014-09-07 08:24:19 +02:00
commit 3d6104e1a1
2 changed files with 5 additions and 15 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luaexpat PKG_NAME:=luaexpat
PKG_VERSION:=1.2.0 PKG_VERSION:=1.3.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://matthewwild.co.uk/projects/luaexpat PKG_SOURCE_URL:=http://matthewwild.co.uk/projects/luaexpat
PKG_MD5SUM:=03efe50c7f30a34580701e6527d7bfee PKG_MD5SUM:=3c20b5795e7107f847f8da844fbfe2da
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -37,8 +37,8 @@ endef
define Build/Compile define Build/Compile
$(CP) files/compat-5.1r5 $(PKG_BUILD_DIR)/compat-5.1r5 $(CP) files/compat-5.1r5 $(PKG_BUILD_DIR)/compat-5.1r5
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
EXPAT_INC="$(STAGING_DIR)/usr/include/" \ EXPAT_INC="-I$(STAGING_DIR)/usr/include/" \
LUA_INC="$(STAGING_DIR)/usr/include/" \ LUA_INC="-I$(STAGING_DIR)/usr/include/" \
LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \ LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \ COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
LIB_OPTION="-shared $(TARGET_LDFLAGS)" \ LIB_OPTION="-shared $(TARGET_LDFLAGS)" \
@ -48,7 +48,7 @@ endef
define Package/luaexpat/install define Package/luaexpat/install
$(INSTALL_DIR) $(1)/usr/lib/lua $(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp.so.1.2.0 $(1)/usr/lib/lua/lxp.so $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp.so $(1)/usr/lib/lua/lxp.so
$(INSTALL_DIR) $(1)/usr/lib/lua/lxp $(INSTALL_DIR) $(1)/usr/lib/lua/lxp
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/lxp $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/lxp
endef endef

View file

@ -1,10 +0,0 @@
--- a/config
+++ b/config
@@ -31,6 +31,6 @@
-Wshadow \
-Wwrite-strings
-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
+CFLAGS = $(CWARNS) -O2 -I$(LUA_INC) \
-I$(COMPAT_DIR) -I$(EXPAT_INC)
CC = gcc