From owner-dev-commits-ports-all@freebsd.org Thu Apr 22 17:21:43 2021 Return-Path: Delivered-To: dev-commits-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 AF85D5F972A; Thu, 22 Apr 2021 17:21:43 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR43C4NvDz4btH; Thu, 22 Apr 2021 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 841201D7EF; Thu, 22 Apr 2021 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MHLhPk091266; Thu, 22 Apr 2021 17:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MHLhVp091265; Thu, 22 Apr 2021 17:21:43 GMT (envelope-from git) Date: Thu, 22 Apr 2021 17:21:43 GMT Message-Id: <202104221721.13MHLhVp091265@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitry Marakasov Subject: git: aeb34a5d6f1f - 2021Q2 - games/brumbrumrally: fix build on 11 by disabling LTO MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: aeb34a5d6f1f0955f3d1089cb06c2788672502b5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 17:21:43 -0000 The branch 2021Q2 has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=aeb34a5d6f1f0955f3d1089cb06c2788672502b5 commit aeb34a5d6f1f0955f3d1089cb06c2788672502b5 Author: Dmitry Marakasov AuthorDate: 2021-04-08 21:34:09 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-22 17:20:05 +0000 games/brumbrumrally: fix build on 11 by disabling LTO --- games/brumbrumrally/files/patch-Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/games/brumbrumrally/files/patch-Makefile b/games/brumbrumrally/files/patch-Makefile index b63395c39e80..c2fabe14a988 100644 --- a/games/brumbrumrally/files/patch-Makefile +++ b/games/brumbrumrally/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2016-03-23 12:05:46 UTC +++ Makefile -@@ -1,19 +1,18 @@ +@@ -1,27 +1,18 @@ OBJS := $(patsubst %.cpp,%.o,$(wildcard src/*.cpp src/hqx/*.cpp)) -DESTDIR = @@ -22,7 +22,15 @@ +CXXFLAGS += -Wall -std=c++98 -pedantic `sdl-config --cflags` -LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_net +- +-# lto is supported in g++ version 4.5.0 or higher +-CXX_MAJOR := $(shell $(CXX) -dumpversion | cut -d'.' -f1) +-CXX_MINOR := $(shell $(CXX) -dumpversion | cut -d'.' -f2) +-CXX_LTO := $(shell [ $(CXX_MAJOR) -gt 4 -o \( $(CXX_MAJOR) -eq 4 -a $(CXX_MINOR) -ge 5 \) ] && echo true || echo false) +-ifeq ($(CXX_LTO),true) +-all : CXXFLAGS += -flto -fwhole-program +-endif +LDFLAGS += `sdl-config --libs` -lSDL_image -lSDL_net - # lto is supported in g++ version 4.5.0 or higher - CXX_MAJOR := $(shell $(CXX) -dumpversion | cut -d'.' -f1) + EXE = brumbrumrally +