From owner-svn-ports-all@freebsd.org Wed Oct 9 18:02:26 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 580F912A2BA; Wed, 9 Oct 2019 18:02:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46pMW61dkBz3GmW; Wed, 9 Oct 2019 18:02:26 +0000 (UTC) (envelope-from amdmi3@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 1C5951C4C5; Wed, 9 Oct 2019 18:02:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x99I2PR1028587; Wed, 9 Oct 2019 18:02:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x99I2PtM028586; Wed, 9 Oct 2019 18:02:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201910091802.x99I2PtM028586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 9 Oct 2019 18:02:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514179 - head/games/endless-sky/files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/games/endless-sky/files X-SVN-Commit-Revision: 514179 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2019 18:02:26 -0000 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)