diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-01-11 23:38:13 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-01-13 20:27:07 (GMT) |
| commit | cd9e79dc6269a7aa7c6c1d652f5d4101b890f8b0 (patch) | |
| tree | ce71e6d16a1b0172b2f24603c198ea0241e4c0fe /plugins/luarocks | |
| parent | 199f2e53b8409c7bf85deb711b088815362d423c (diff) | |
| download | mxe-cd9e79dc6269a7aa7c6c1d652f5d4101b890f8b0.zip mxe-cd9e79dc6269a7aa7c6c1d652f5d4101b890f8b0.tar.gz mxe-cd9e79dc6269a7aa7c6c1d652f5d4101b890f8b0.tar.bz2 | |
luarocks: unify the patch
Diffstat (limited to 'plugins/luarocks')
| -rw-r--r-- | plugins/luarocks/luarocks-1-fixes.patch (renamed from plugins/luarocks/luarocks-1-platform-mxe.patch) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/luarocks/luarocks-1-platform-mxe.patch b/plugins/luarocks/luarocks-1-fixes.patch index 127e06e..8940e8e 100644 --- a/plugins/luarocks/luarocks-1-platform-mxe.patch +++ b/plugins/luarocks/luarocks-1-fixes.patch @@ -1,13 +1,16 @@ This file is part of MXE. See index.html for further information. -From 5cd28e7a8f0de2539322ede15616904835a4dbe3 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev <bnagaev@gmail.com> Date: Sat, 10 Oct 2015 17:45:24 +0100 Subject: [PATCH] platform MXE + diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua -index 00fd09e..a4985e9 100644 +index 1111111..2222222 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua @@ -165,7 +165,7 @@ function builtin.run(rockspec) @@ -20,7 +23,7 @@ index 00fd09e..a4985e9 100644 end return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras)) diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua -index 99b4077..a17fbaa 100644 +index 1111111..2222222 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -118,6 +118,9 @@ elseif system and system:match("^Windows") then @@ -78,6 +81,3 @@ index 99b4077..a17fbaa 100644 if detected.cygwin then defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds defaults.arch = "cygwin-"..proc --- -2.1.4 - |