From owner-svn-ports-head@freebsd.org Thu Aug 16 16:53:18 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27944106E368; Thu, 16 Aug 2018 16:53:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D1A8F8D2C6; Thu, 16 Aug 2018 16:53:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A0641C2CD; Thu, 16 Aug 2018 16:53:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7GGrH5L093201; Thu, 16 Aug 2018 16:53:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7GGrHMN093200; Thu, 16 Aug 2018 16:53:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808161653.w7GGrHMN093200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 16 Aug 2018 16:53:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477364 - head/devel/lua-luarocks/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/lua-luarocks/files X-SVN-Commit-Revision: 477364 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 16:53:18 -0000 Author: jbeich Date: Thu Aug 16 16:53:17 2018 New Revision: 477364 URL: https://svnweb.freebsd.org/changeset/ports/477364 Log: devel/lua-luarocks: clean up cfg patch - Bitrig is dead, changes subsumed by OpenBSD (Clang/libc++, aarch64 support) - Overriding GNU make didn't work on BSDs and was rarely useful - Annotate changes in the patch to avoid losing them on update Modified: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua (contents, props changed) Modified: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua ============================================================================== --- head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua Thu Aug 16 16:49:57 2018 (r477363) +++ head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua Thu Aug 16 16:53:17 2018 (r477364) @@ -1,23 +1,24 @@ ---- src/luarocks/cfg.lua.orig 2015-12-29 15:50:11 UTC +- Add DragonFly support +- Respect CC/CFLAGS/LD/LDFLAGS +- Prefer system compiler over GCC on BSDs/Solaris +- OpenBSD uses Clang by default, so don't pass GCC RPATH + +--- src/luarocks/cfg.lua.orig 2018-03-13 00:08:59 UTC +++ src/luarocks/cfg.lua -@@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the +@@ -87,7 +87,11 @@ elseif proc:match("Power Macintosh") then cfg.target_cpu = proc end -if system == "FreeBSD" then -+if system == "Bitrig" then ++if system == "DragonFly" 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 +@@ -517,16 +521,17 @@ if cfg.platforms.unix then defaults.lib_extension = "so" defaults.external_lib_extension = "so" defaults.obj_extension = "o" @@ -31,7 +32,6 @@ 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 @@ -41,14 +41,10 @@ defaults.external_deps_patterns = { bin = { "?" }, lib = { "lib?.a", "lib?.so", "lib?.so.*" }, -@@ -548,11 +558,17 @@ if cfg.platforms.linux then +@@ -607,15 +612,18 @@ 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 @@ -61,3 +57,8 @@ end if cfg.platforms.openbsd then + defaults.arch = "openbsd-"..cfg.target_cpu ++ defaults.gcc_rpath = false + end + + if cfg.platforms.netbsd then