- luaposix: bump version to 34.0.4; update build; thx to max10

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:
+$(ARCHIVE)/$(LUAPOSIX_SOURCE):
-	$(WGET) https://github.com/luaposix/luaposix/archive/v$(LUAPOSIX_VER).tar.gz
+	$(WGET) $(LUAPOSIX_URL)/v$(LUAPOSIX_VER).tar.gz -O $@
 
-LUAPOSIX_PATCH  = luaposix-fix-build.patch
+$(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
-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)
 	$(REMOVE)/luaposix-$(LUAPOSIX_VER)
-	$(UNTAR)/v$(LUAPOSIX_VER).tar.gz
+	$(UNTAR)/$(LUAPOSIX_SOURCE)
-	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
 	$(CHDIR)/luaposix-$(LUAPOSIX_VER); \
-		$(call apply_patches, $(LUAPOSIX_PATCH)); \
+		$(HOST_DIR)/bin/lua-$(LUA_VER) build-aux/luke \
-		export LUA=$(HOST_DIR)/bin/lua-$(LUA_VER); \
+			CC="$(TARGET)-gcc" \
-		./bootstrap; \
+			CFLAGS="$(TARGET_CFLAGS)" \
-		autoreconf -fi; \
+			LUA_INCDIR=$(TARGET_INCLUDE_DIR); \
-		$(CONFIGURE) \
+		$(HOST_DIR)/bin/lua-$(LUA_VER) build-aux/luke install \
-			--prefix= \
+			INST_LIBDIR="$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER)" \
-			--exec-prefix= \
+			INST_LUADIR="$(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)"
-			--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
 	$(REMOVE)/luaposix-$(LUAPOSIX_VER)
 	$(TOUCH)