Changeset View
Changeset View
Standalone View
Standalone View
files/patch-src_luarocks_cfg.lua
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | yes \ No newline at end of property | null |
| svn:eol-style | native \ No newline at end of property | null |
| svn:mime-type | text/plain \ No newline at end of property | null |
| --- src/luarocks/cfg.lua.orig 2015-12-29 15:50:11 UTC | |||||
jbeich: The file was renamed, not removed upstream. Respecting CC/CFLAGS/LD/LDFLAGS is [mandatory]… | |||||
Not Done Inline ActionsActually, respecting CC/CFLAGS/LD/LDFLAGS can be via command-line arguments e.g., luarocks-5.2 build --local CFLAGS="-O3 -pipe -flto -fPIC" LIBFLAG="-flto -fuse-ld=lld -shared" penlight. If this is done in USES=luarocks, USE_LUA=luarocks or similar the patch can go away. However, other language-specific package managers usually respect user environment (e.g., devel/py-pip, cargo from lang/rust). jbeich: Actually, respecting CC/CFLAGS/LD/LDFLAGS can be via command-line arguments e.g., `luarocks-5.2… | |||||
| +++ src/luarocks/cfg.lua | |||||
| @@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the | |||||
| cfg.target_cpu = proc | |||||
| end | |||||
| -if system == "FreeBSD" then | |||||
| +if system == "Bitrig" then | |||||
| + cfg.platforms.unix = true | |||||
| + cfg.platforms.bitrig = true | |||||
| + cfg.platforms.bsd = true | |||||
| +elseif system == "DragonFly" then | |||||
| + cfg.platforms.unix = true | |||||
| + cfg.platforms.dragonfly = true | |||||
| + cfg.platforms.bsd = true | |||||
| +elseif system == "FreeBSD" then | |||||
| cfg.platforms.unix = true | |||||
| cfg.platforms.freebsd = true | |||||
| cfg.platforms.bsd = true | |||||
| @@ -477,16 +485,18 @@ if cfg.platforms.unix then | |||||
| defaults.lib_extension = "so" | |||||
| defaults.external_lib_extension = "so" | |||||
| defaults.obj_extension = "o" | |||||
| - defaults.external_deps_dirs = { "/usr/local", "/usr" } | |||||
| + defaults.external_deps_dirs = { site_config.LUAROCKS_PREFIX, "/usr" } | |||||
| defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin" | |||||
| defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" | |||||
| defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" | |||||
| - defaults.variables.CFLAGS = "-O2" | |||||
| + defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" | |||||
| defaults.cmake_generator = "Unix Makefiles" | |||||
| - defaults.variables.CC = "gcc" | |||||
| - defaults.variables.LD = "gcc" | |||||
| + defaults.variables.MAKE = os.getenv("MAKE") or defaults.variables.MAKE | |||||
| + -- Assume "cc" is a modern GCC-compatible compiler | |||||
| + defaults.variables.CC = os.getenv("CC") or defaults.variables.CC | |||||
| + defaults.variables.LD = os.getenv("CC") or defaults.variables.CC | |||||
| defaults.gcc_rpath = true | |||||
| - defaults.variables.LIBFLAG = "-shared" | |||||
| + defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared" | |||||
| defaults.external_deps_patterns = { | |||||
| bin = { "?" }, | |||||
| lib = { "lib?.a", "lib?.so", "lib?.so.*" }, | |||||
| @@ -548,11 +558,17 @@ if cfg.platforms.linux then | |||||
| defaults.arch = "linux-"..cfg.target_cpu | |||||
| end | |||||
| +if cfg.platforms.bitrig then | |||||
| + defaults.arch = "bitrig-"..cfg.target_cpu | |||||
| +end | |||||
| + | |||||
| +if cfg.platforms.dragonfly then | |||||
| + defaults.arch = "dragonfly-"..cfg.target_cpu | |||||
| +end | |||||
| + | |||||
| if cfg.platforms.freebsd then | |||||
| defaults.arch = "freebsd-"..cfg.target_cpu | |||||
| defaults.gcc_rpath = false | |||||
| - defaults.variables.CC = "cc" | |||||
| - defaults.variables.LD = "cc" | |||||
| end | |||||
| if cfg.platforms.openbsd then | |||||
The file was renamed, not removed upstream. Respecting CC/CFLAGS/LD/LDFLAGS is mandatory in ports/ i.e., if this port is ever used in BUILD_DEPENDS. DragonFly support is a bonus but highlights platform whitelists that often grow out of date.