diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2019-10-10 02:02:25 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2019-10-10 02:02:25 +0800 |
| commit | 477e1201cc55b4bdf874a21c3ddb24fb9d69245e (patch) | |
| tree | 7bd66c18cb2a418b08f33229b7181d1695ec0d79 /games | |
| parent | 36a66f12da9c18c8d032298a88c2fd446561483f (diff) | |
| download | freebsd-ports-gnome-477e1201cc55b4bdf874a21c3ddb24fb9d69245e.tar.gz freebsd-ports-gnome-477e1201cc55b4bdf874a21c3ddb24fb9d69245e.tar.zst freebsd-ports-gnome-477e1201cc55b4bdf874a21c3ddb24fb9d69245e.zip | |
- Respect CXX to fix build on GCC architectures
PR: 241120
Submitted by: pkubaj@FreeBSD.org
Diffstat (limited to 'games')
| -rw-r--r-- | games/endless-sky/files/patch-SConstruct | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/games/endless-sky/files/patch-SConstruct b/games/endless-sky/files/patch-SConstruct index ec6af5a1aa55..0f1b2b956c16 100644 --- a/games/endless-sky/files/patch-SConstruct +++ b/games/endless-sky/files/patch-SConstruct @@ -1,6 +1,15 @@ ---- 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": @@ -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) |