diff options
author | fiendish <patcherton.fixesthings@gmail.com> | 2016-07-27 11:11:06 (GMT) |
---|---|---|
committer | fiendish <patcherton.fixesthings@gmail.com> | 2016-07-27 15:19:53 (GMT) |
commit | b2fee50a51fc44b2a5d8ed485dcaae3e8268fb6b (patch) | |
tree | 09612e7e5110e5f00f755b6af9aa9d30664a5f8b | |
parent | 779e4988cd4a06d27be4478f3fb20fba2a289dc8 (diff) | |
download | mxe-b2fee50a51fc44b2a5d8ed485dcaae3e8268fb6b.zip mxe-b2fee50a51fc44b2a5d8ed485dcaae3e8268fb6b.tar.gz mxe-b2fee50a51fc44b2a5d8ed485dcaae3e8268fb6b.tar.bz2 |
Use official Lua DLL version naming
-rw-r--r-- | plugins/luarocks/luarocks-1-fixes.patch | 2 | ||||
-rw-r--r-- | src/lua.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/luarocks/luarocks-1-fixes.patch b/plugins/luarocks/luarocks-1-fixes.patch index 33e9fb8..4860d52 100644 --- a/plugins/luarocks/luarocks-1-fixes.patch +++ b/plugins/luarocks/luarocks-1-fixes.patch @@ -81,7 +81,7 @@ index 1111111..2222222 100644 + } + defaults.runtime_external_deps_patterns = { + bin = { "?.exe", "?.bat" }, -+ lib = { "?.dll", "lib?.dll" }, ++ lib = { "?.dll" }, + include = { "?.h" } + } +end @@ -6,6 +6,7 @@ $(PKG)_IGNORE := $(PKG)_VERSION := 5.3.3 # Shared version and luarocks subdir $(PKG)_SHORTVER := $(call SHORT_PKG_VERSION,$(PKG)) +$(PKG)_DLLVER := $(subst .,,$($(PKG)_SHORTVER)) $(PKG)_CHECKSUM := 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2 $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz @@ -66,12 +67,12 @@ define $(PKG)_BUILD_SHARED AR='$(TARGET)-gcc -Wl,--out-implib,liblua.dll.a -shared -o' \ RANLIB='echo skipped ranlib' \ SYSCFLAGS='-DLUA_BUILD_AS_DLL' \ - LUA_A=liblua$($(PKG)_SHORTVER).dll \ + LUA_A=lua$($(PKG)_DLLVER).dll \ a lua $(MAKE) -C '$(1)' -j 1 \ INSTALL_TOP='$(PREFIX)/$(TARGET)' \ INSTALL_MAN='$(1)/noinstall' \ - TO_BIN='liblua$($(PKG)_SHORTVER).dll' \ + TO_BIN='lua$($(PKG)_DLLVER).dll' \ INSTALL='$(INSTALL)' \ TO_LIB='liblua.dll.a' \ install |