diff --git a/make/system-lua.mk b/make/system-lua.mk index a1f393d4..09b1ec3f 100644 --- a/make/system-lua.mk +++ b/make/system-lua.mk @@ -108,44 +108,23 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR) # ----------------------------------------------------------------------------- -LUAPOSIX_VER = 31 +LUAPOSIX_VER = 34.0.4 +LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz +LUAPOSIX_URL = https://github.com/luaposix/luaposix/archive -$(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz: - $(WGET) https://github.com/luaposix/luaposix/archive/v$(LUAPOSIX_VER).tar.gz +$(ARCHIVE)/$(LUAPOSIX_SOURCE): + $(WGET) $(LUAPOSIX_URL)/v$(LUAPOSIX_VER).tar.gz -O $@ -LUAPOSIX_PATCH = luaposix-fix-build.patch -LUAPOSIX_PATCH += luaposix-fix-docdir-build.patch - -SLINGSHOT_VER = 6 - -$(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz: - $(WGET) https://github.com/gvvaughan/slingshot/archive/v$(SLINGSHOT_VER).tar.gz - -GNULIB_VER = 20140202 - -$(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz: - $(WGET) http://erislabs.net/ianb/projects/gnulib/gnulib-$(GNULIB_VER)-stable.tar.gz - -$(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz | $(TARGET_DIR) +$(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR) $(REMOVE)/luaposix-$(LUAPOSIX_VER) - $(UNTAR)/v$(LUAPOSIX_VER).tar.gz - tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/slingshot --strip=1 -xf $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz - tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/gnulib --strip=1 -xf $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz + $(UNTAR)/$(LUAPOSIX_SOURCE) $(CHDIR)/luaposix-$(LUAPOSIX_VER); \ - $(call apply_patches, $(LUAPOSIX_PATCH)); \ - export LUA=$(HOST_DIR)/bin/lua-$(LUA_VER); \ - ./bootstrap; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix= \ - --exec-prefix= \ - --libdir=$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER) \ - --datarootdir=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) \ - --mandir=$(TARGET_DIR)/.remove \ - --docdir=$(TARGET_DIR)/.remove \ - --enable-silent-rules \ - ; \ - $(MAKE); \ - $(MAKE) all check install + $(HOST_DIR)/bin/lua-$(LUA_VER) build-aux/luke \ + CC="$(TARGET)-gcc" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LUA_INCDIR=$(TARGET_INCLUDE_DIR); \ + $(HOST_DIR)/bin/lua-$(LUA_VER) build-aux/luke install \ + INST_LIBDIR="$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER)" \ + INST_LUADIR="$(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)" $(REMOVE)/luaposix-$(LUAPOSIX_VER) $(TOUCH)