svn commit: r547072 - in head/games: quake2-lights/files quake2-psychomod/files

[Alexey Dokuchaev]

Author: danfe
Date: Sun Aug 30 18:39:38 2020
New Revision: 547072
URL: https://svnweb.freebsd.org/changeset/ports/547072

Log:
  Drop unsupported -fexpensive-optimizations option from the CFLAGS and
  add -fcommon instead to unbreak the build against Clang 11 and GCC 10.
  
  Reported by:	pkg-fallout

Modified:
  head/games/quake2-lights/files/patch-lights-src-Makefile
  head/games/quake2-psychomod/files/patch-src_Makefile

Modified: head/games/quake2-lights/files/patch-lights-src-Makefile
==============================================================================
--- head/games/quake2-lights/files/patch-lights-src-Makefile	Sun Aug 30 18:36:07 2020	(r547071)
+++ head/games/quake2-lights/files/patch-lights-src-Makefile	Sun Aug 30 18:39:38 2020	(r547072)
@@ -1,6 +1,6 @@
 --- ./lights/src/Makefile.orig	Tue Oct 11 19:55:43 2005
 +++ ./lights/src/Makefile	Sun Dec 24 15:09:48 2006
-@@ -1,27 +1,19 @@
+@@ -1,27 +1,18 @@
  
 -BUILD_DEBUG_DIR=debugi386
 -BUILD_RELEASE_DIR=releasei386
@@ -15,21 +15,21 @@
 -ifneq ($(ARCH),ppc)
 -ifneq ($(ARCH),sparc)
 -$(error arch $(ARCH) is currently not supported)
++CC?=gcc
++BASE_CFLAGS=-fcommon
++RELEASE_CFLAGS=$(BASE_CFLAGS) -fomit-frame-pointer
++ifeq ($(ARCH),i386)
++RELEASE_CFLAGS+=-falign-functions=2
+ endif
 -endif
 -endif
 -endif
--endif
 -
 -CC=gcc
-+CC?=gcc
- BASE_CFLAGS=
- RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -fomit-frame-pointer \
+-BASE_CFLAGS=
+-RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -fomit-frame-pointer \
 -	-fexpensive-optimizations -falign-loops=2 \
 -	-falign-jumps=2 -falign-functions=2
-+	       -fexpensive-optimizations
-+ifeq ($(ARCH),i386)
-+RELEASE_CFLAGS+=-falign-functions=2
-+endif
  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 -LDFLAGS=-ldl -lm
 +LDFLAGS=-lm

Modified: head/games/quake2-psychomod/files/patch-src_Makefile
==============================================================================
--- head/games/quake2-psychomod/files/patch-src_Makefile	Sun Aug 30 18:36:07 2020	(r547071)
+++ head/games/quake2-psychomod/files/patch-src_Makefile	Sun Aug 30 18:39:38 2020	(r547072)
@@ -1,6 +1,6 @@
 --- src/Makefile.orig	2006-02-01 23:46:55 UTC
 +++ src/Makefile
-@@ -16,20 +16,10 @@ OSTYPE := $(shell uname -s)
+@@ -16,24 +16,14 @@ OSTYPE := $(shell uname -s)
  # this nice line comes from the linux kernel makefile
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
  
@@ -13,17 +13,23 @@
 -endif
 -endif
 -endif
--
--BUILD_DEBUG_DIR=debug$(ARCH)
--BUILD_RELEASE_DIR=release$(ARCH)
 +BUILD_DEBUG_DIR=debug
 +BUILD_RELEASE_DIR=release
  
--CC=gcc
+-BUILD_DEBUG_DIR=debug$(ARCH)
+-BUILD_RELEASE_DIR=release$(ARCH)
 +CC?=gcc
- BASE_CFLAGS=-Dstricmp=strcasecmp 
++BASE_CFLAGS=-Dstricmp=strcasecmp -fcommon
  
+-CC=gcc
+-BASE_CFLAGS=-Dstricmp=strcasecmp 
+-
  RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
+-	-fomit-frame-pointer -fexpensive-optimizations
++	-fomit-frame-pointer
+ 	
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb -Wall -pipe
+ 
 @@ -53,7 +43,7 @@ SHLIBLDFLAGS=-shared
  DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
  DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<