Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Apr 2021 17:21:43 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: aeb34a5d6f1f - 2021Q2 - games/brumbrumrally: fix build on 11 by disabling LTO
Message-ID:  <202104221721.13MHLhVp091265@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aeb34a5d6f1f0955f3d1089cb06c2788672502b5

commit aeb34a5d6f1f0955f3d1089cb06c2788672502b5
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-04-08 21:34:09 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
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
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104221721.13MHLhVp091265>