diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-09-23 17:16:10 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-09-23 17:16:10 +0000 |
commit | 946701bce895e6a49b0cc892995d9d6cde42f6b0 (patch) | |
tree | 50f0d58e8642426e8f09040385ef775f34f857f5 /games/quake2max | |
parent | 1f6cfc16a93841c03687dd5b987c2d9bf7090888 (diff) | |
download | ports-946701bce895e6a49b0cc892995d9d6cde42f6b0.tar.gz ports-946701bce895e6a49b0cc892995d9d6cde42f6b0.zip |
Force -fcommon build to appease modern compilers (should've been part of
r548182); while at it, drop -O2 and unsupported optimization option from
the CFLAGS.
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=549756
Diffstat (limited to 'games/quake2max')
-rw-r--r-- | games/quake2max/files/patch-Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/games/quake2max/files/patch-Makefile b/games/quake2max/files/patch-Makefile index d633abfc8d97..c6b685b0a326 100644 --- a/games/quake2max/files/patch-Makefile +++ b/games/quake2max/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Jan 11 16:55:21 2006 -+++ Makefile Mon Aug 7 16:31:23 2006 -@@ -17,15 +17,16 @@ +--- Makefile.orig 2006-01-11 13:03:20 UTC ++++ Makefile +@@ -17,15 +17,16 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/su #OPTIONS ###################################### @@ -26,9 +26,12 @@ ###################################### -@@ -38,14 +39,17 @@ +@@ -36,16 +37,19 @@ MOUNT_DIR=. + BINDIR=quake2 + CC?=gcc - BASE_CFLAGS= #-Wall -pipe +-BASE_CFLAGS= #-Wall -pipe ++BASE_CFLAGS= -Wall -fcommon #-pipe DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb -RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations +RELEASE_CFLAGS=$(BASE_CFLAGS) @@ -36,7 +39,7 @@ -ifeq ($(ARCH),i386) - RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing +ifeq ($(WITH_OPTIMIZED_CFLAGS),YES) -+ RELEASE_CFLAGS+=-O2 -ffast-math -fomit-frame-pointer -fexpensive-optimizations ++ RELEASE_CFLAGS+=-ffast-math -fomit-frame-pointer + ifeq ($(ARCH),i386) + RELEASE_CFLAGS+=-falign-functions=2 -fno-strict-aliasing + endif |