diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-08-06 05:41:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-06 05:41:10 (GMT) |
| commit | fcbd2fbcc797dd59ca5c1915ee70da4522b368eb (patch) | |
| tree | 96e25dfbc4092ae0604393d5405fbc43ae1a7fd5 | |
| parent | a644700c8cd9246df80200f4c6444c108a8fceee (diff) | |
| parent | b2fee50a51fc44b2a5d8ed485dcaae3e8268fb6b (diff) | |
| download | mxe-fcbd2fbcc797dd59ca5c1915ee70da4522b368eb.zip mxe-fcbd2fbcc797dd59ca5c1915ee70da4522b368eb.tar.gz mxe-fcbd2fbcc797dd59ca5c1915ee70da4522b368eb.tar.bz2 | |
Merge pull request #1458 from fiendish/proper_lua_dll_name
Windows Lua DLLs should not start with "lib"
| -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 |