Changeset View
Changeset View
Standalone View
Standalone View
lua-luarocks/files/patch-src_luarocks_core_cfg.lua
| Context not available. | |||||
| - Prefer system compiler over GCC on BSDs/Solaris | - Prefer system compiler over GCC on BSDs/Solaris | ||||
| - OpenBSD uses Clang by default, so don't pass GCC RPATH | - OpenBSD uses Clang by default, so don't pass GCC RPATH | ||||
| --- src/luarocks/core/cfg.lua.orig 2018-08-14 16:30:42 UTC | --- src/luarocks/core/cfg.lua.orig 2019-09-05 19:23:34 UTC | ||||
| +++ src/luarocks/core/cfg.lua | +++ src/luarocks/core/cfg.lua | ||||
| @@ -35,6 +35,7 @@ local platform_order = { | @@ -36,6 +36,7 @@ local platform_order = { | ||||
| "netbsd", | "netbsd", | ||||
| "openbsd", | "openbsd", | ||||
| "freebsd", | "freebsd", | ||||
| Context not available. | |||||
| "linux", | "linux", | ||||
| "macosx", | "macosx", | ||||
| "cygwin", | "cygwin", | ||||
| @@ -154,6 +155,7 @@ end | @@ -158,6 +159,7 @@ end | ||||
| local function make_platforms(system) | local platform_sets = { | ||||
| if system then | freebsd = { unix = true, bsd = true, freebsd = true }, | ||||
| if system == "Linux" then return { unix = true, linux = true } | openbsd = { unix = true, bsd = true, openbsd = true }, | ||||
| + elseif system == "DragonFly" then return { unix = true, bsd = true, dragonfly = true } | + dragonflybsd = { unix = true, bsd = true, dragonfly = true }, | ||||
| elseif system == "FreeBSD" then return { unix = true, bsd = true, freebsd = true } | solaris = { unix = true, solaris = true }, | ||||
| elseif system == "OpenBSD" then return { unix = true, bsd = true, openbsd = true } | windows = { windows = true, win32 = true }, | ||||
| elseif system == "NetBSD" then return { unix = true, bsd = true, netbsd = true } | cygwin = { unix = true, cygwin = true }, | ||||
| @@ -357,13 +359,13 @@ local function make_defaults(lua_version, target_cpu, | @@ -341,7 +343,7 @@ local function make_defaults(lua_version, target_cpu, | ||||
| defaults.external_lib_extension = "so" | defaults.variables.LD = "mingw32-gcc" | ||||
| defaults.obj_extension = "o" | defaults.variables.AR = "ar" | ||||
| defaults.external_deps_dirs = { "/usr/local", "/usr", "/" } | defaults.variables.RANLIB = "ranlib" | ||||
| - defaults.variables.CFLAGS = "-O2" | - defaults.variables.CFLAGS = "-O2" | ||||
| + defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" | + defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" | ||||
| defaults.variables.LIBFLAG = "-shared" | |||||
| defaults.makefile = "Makefile" | |||||
| defaults.external_deps_patterns = { | |||||
| @@ -367,10 +369,11 @@ local function make_defaults(lua_version, target_cpu, | |||||
| defaults.external_deps_dirs = { "/usr/local", "/usr", "/" } | |||||
| defaults.variables.CFLAGS = "-O2" | |||||
| defaults.cmake_generator = "Unix Makefiles" | defaults.cmake_generator = "Unix Makefiles" | ||||
| - defaults.variables.CC = "gcc" | - defaults.variables.CC = "gcc" | ||||
| - defaults.variables.LD = "gcc" | - defaults.variables.LD = "gcc" | ||||
| Context not available. | |||||
| + defaults.variables.LD = os.getenv("CC") or defaults.variables.CC | + defaults.variables.LD = os.getenv("CC") or defaults.variables.CC | ||||
| defaults.gcc_rpath = true | defaults.gcc_rpath = true | ||||
| - defaults.variables.LIBFLAG = "-shared" | - defaults.variables.LIBFLAG = "-shared" | ||||
| - | |||||
| + defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared" | + defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared" | ||||
| defaults.variables.TEST = "test" | |||||
| defaults.external_deps_patterns = { | defaults.external_deps_patterns = { | ||||
| bin = { "?" }, | @@ -454,15 +457,18 @@ local function make_defaults(lua_version, target_cpu, | ||||
| lib = { "lib?.a", "lib?.so", "lib?.so.*" }, | |||||
| @@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu, | |||||
| end | end | ||||
| end | end | ||||
| Context not available. | |||||