svn commit: r397536 - in head/devel/lua-luarocks: . files
Jan Beich
jbeich at FreeBSD.org
Tue Sep 22 11:24:35 UTC 2015
Author: jbeich
Date: Tue Sep 22 11:24:34 2015
New Revision: 397536
URL: https://svnweb.freebsd.org/changeset/ports/397536
Log:
devel/lua-luarocks:
- Respect CC/CFLAGS/LDFLAGS
- Call gmake instead of make on DragonFly
- Properly specify LUAJIT dependency
Added:
head/devel/lua-luarocks/files/
head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua (contents, props changed)
Modified:
head/devel/lua-luarocks/Makefile (contents, props changed)
Modified: head/devel/lua-luarocks/Makefile
==============================================================================
--- head/devel/lua-luarocks/Makefile Tue Sep 22 10:52:02 2015 (r397535)
+++ head/devel/lua-luarocks/Makefile Tue Sep 22 11:24:34 2015 (r397536)
@@ -3,6 +3,7 @@
PORTNAME= luarocks
PORTVERSION= 2.2.2
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
@@ -50,7 +51,8 @@ SVN_DESC= Subversion support
SVN_RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion
LUAJIT_DESC= Use LuaJIT instead of Lua
-LUAJIT_LIB_DEPENDS= libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit
+LUAJIT_BUILD_DEPENDS= luajit:${PORTSDIR}/lang/luajit
+LUAJIT_RUN_DEPENDS= luajit:${PORTSDIR}/lang/luajit
LUAJIT_CONFIGURE_ON= --lua-suffix=jit
LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \
LUA_MODSHAREDIR=share/lua/${LUA_VER}
Added: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua Tue Sep 22 11:24:34 2015 (r397536)
@@ -0,0 +1,67 @@
+--- src/luarocks/cfg.lua.orig 2015-04-24 18:28:33 UTC
++++ src/luarocks/cfg.lua
+@@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the
+ proc = "powerpc"
+ end
+
+-if system == "FreeBSD" then
++if system == "Bitrig" then
++ detected.unix = true
++ detected.bitrig = true
++ detected.bsd = true
++elseif system == "DragonFly" then
++ detected.unix = true
++ detected.dragonfly = true
++ detected.bsd = true
++elseif system == "FreeBSD" then
+ detected.unix = true
+ detected.freebsd = true
+ detected.bsd = true
+@@ -397,17 +405,19 @@ if detected.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.platforms = { "unix" }
+- 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.*" },
+@@ -472,12 +482,20 @@ if detected.linux then
+ defaults.platforms = {"unix", "linux"}
+ end
+
++if detected.bitrig then
++ defaults.arch = "bitrig-"..proc
++ defaults.platforms = {"unix", "bsd", "bitrig"}
++end
++
++if detected.dragonfly then
++ defaults.arch = "dragonfly-"..proc
++ defaults.platforms = {"unix", "bsd", "dragonfly"}
++end
++
+ if detected.freebsd then
+ defaults.arch = "freebsd-"..proc
+ defaults.platforms = {"unix", "bsd", "freebsd"}
+ defaults.gcc_rpath = false
+- defaults.variables.CC = "cc"
+- defaults.variables.LD = "cc"
+ end
+
+ if detected.openbsd then
More information about the svn-ports-head
mailing list