Date: Wed, 9 Oct 2019 18:02:25 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514179 - head/games/endless-sky/files Message-ID: <201910091802.x99I2PtM028586@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Oct 9 18:02:25 2019 New Revision: 514179 URL: https://svnweb.freebsd.org/changeset/ports/514179 Log: - Respect CXX to fix build on GCC architectures PR: 241120 Submitted by: pkubaj@FreeBSD.org Modified: head/games/endless-sky/files/patch-SConstruct Modified: head/games/endless-sky/files/patch-SConstruct ============================================================================== --- head/games/endless-sky/files/patch-SConstruct Wed Oct 9 17:48:04 2019 (r514178) +++ head/games/endless-sky/files/patch-SConstruct Wed Oct 9 18:02:25 2019 (r514179) @@ -1,7 +1,16 @@ ---- SConstruct.orig 2016-06-24 12:15:47 UTC +--- SConstruct.orig 2019-09-28 17:59:47 UTC +++ SConstruct -@@ -24,7 +24,7 @@ Help(opts.GenerateHelpText(env)) +@@ -2,6 +2,8 @@ import os + # Load environment variables, including some that should be renamed. + env = Environment(ENV = os.environ) ++if 'CXX' in os.environ: ++ env['CXX'] = os.environ['CXX'] + if 'CXXFLAGS' in os.environ: + env.Append(CCFLAGS = os.environ['CXXFLAGS']) + if 'LDFLAGS' in os.environ: +@@ -22,7 +24,7 @@ Help(opts.GenerateHelpText(env)) + flags = ["-std=c++11", "-Wall"] if env["mode"] != "debug": - flags += ["-O3"] @@ -9,7 +18,7 @@ if env["mode"] == "debug": flags += ["-g"] if env["mode"] == "profile": -@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("b +@@ -57,7 +59,7 @@ sky = env.Program("endless-sky", Glob(buildDirectory + # Install the binary: @@ -18,7 +27,7 @@ # Install the desktop file: env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") -@@ -80,7 +80,7 @@ if env.get("PREFIX").startswith("/usr/") +@@ -85,7 +87,7 @@ if env.get("PREFIX").startswith("/usr/"): # Install the man page. env.Command( @@ -27,7 +36,7 @@ "endless-sky.6", "gzip -c $SOURCE > $TARGET") -@@ -93,11 +93,11 @@ def RecursiveInstall(env, target, source +@@ -98,11 +100,11 @@ def RecursiveInstall(env, target, source): RecursiveInstall(env, os.path.join(target, name), node.abspath) else: env.Install(target, node)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910091802.x99I2PtM028586>