summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2019-06-30 03:01:47 (GMT)
committerTony Theodore <tonyt@logyst.com>2019-06-30 03:01:47 (GMT)
commit921c82f383f87b8502dfc604bbe4de512a396621 (patch)
tree6fd17673a0594e75490ed73f6220bca582af338a
parent56fa41ad720b7ba777595729cffbb1f96fa99665 (diff)
downloadmxe-921c82f383f87b8502dfc604bbe4de512a396621.zip
mxe-921c82f383f87b8502dfc604bbe4de512a396621.tar.gz
mxe-921c82f383f87b8502dfc604bbe4de512a396621.tar.bz2
luajit: 2.0.4 --> 2.0.5 and enable shared
-rw-r--r--src/luajit.mk20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/luajit.mk b/src/luajit.mk
index 94b120b..3e67dd1 100644
--- a/src/luajit.mk
+++ b/src/luajit.mk
@@ -4,9 +4,10 @@ PKG := luajit
$(PKG)_WEBSITE := https://luajit.org/luajit.html
$(PKG)_DESCR := LuaJIT
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.0.4
+$(PKG)_VERSION := 2.0.5
$(PKG)_ABIVER := 5.1
-$(PKG)_CHECKSUM := 620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d
+$(PKG)_DLLNAME := $(PKG)$(subst .,,$($(PKG)_ABIVER)).dll
+$(PKG)_CHECKSUM := 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
$(PKG)_SUBDIR := LuaJIT-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz
$(PKG)_URL := https://luajit.org/download/$($(PKG)_FILE)
@@ -14,18 +15,23 @@ $(PKG)_DEPS := cc dlfcn-win32
$(PKG)_DEPS_$(BUILD) :=
define $(PKG)_BUILD
- $(MAKE) -C '$(1)' -j '$(JOBS)' \
- HOST_CC='$(BUILD_CC) -m$(BITS)' CROSS='$(TARGET)-' \
- TARGET_SYS=Windows BUILDMODE=static \
+ $(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)' \
+ HOST_CC='$(BUILD_CC) -m$(BITS)' \
+ CROSS='$(TARGET)-' \
+ TARGET_SYS=Windows \
+ BUILDMODE=$(if $(BUILD_STATIC),static,dynamic) \
PREFIX='$(PREFIX)/$(TARGET)' \
+ TARGET_DLLNAME=$($(PKG)_DLLNAME) \
FILE_T=luajit.exe \
INSTALL_TNAME=luajit-$($(PKG)_VERSION).exe \
INSTALL_TSYMNAME=luajit.exe \
install
+ $(if $(BUILD_SHARED),\
+ $(INSTALL) -m644 '$(SOURCE_DIR)/src/$($(PKG)_DLLNAME)' '$(PREFIX)/$(TARGET)/bin/')
endef
define $(PKG)_BUILD_$(BUILD)
- $(MAKE) -C '$(1)' -j '$(JOBS)' \
+ $(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)' \
BUILDMODE=static \
PREFIX='$(PREFIX)/$(BUILD)' \
install
@@ -40,5 +46,3 @@ endif
ifeq ($(findstring x86_64-apple-darwin,$(BUILD)),x86_64-apple-darwin)
$(PKG)_BUILD_i686-w64-mingw32 =
endif
-
-$(PKG)_BUILD_SHARED =