Date: Thu, 10 Sep 2020 04:04:41 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548182 - in head/games: egl/files q2p/files Message-ID: <202009100404.08A44fGo032071@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Sep 10 04:04:40 2020 New Revision: 548182 URL: https://svnweb.freebsd.org/changeset/ports/548182 Log: Add -fcommon to CFLAGS to unbreak the build against modern compilers, e.g. Clang 11 or GCC 10, and remove unsupported optimization options. Reported by: pkg-fallout Modified: head/games/egl/files/patch-makefile head/games/q2p/files/patch-Makefile Modified: head/games/egl/files/patch-makefile ============================================================================== --- head/games/egl/files/patch-makefile Thu Sep 10 04:04:14 2020 (r548181) +++ head/games/egl/files/patch-makefile Thu Sep 10 04:04:40 2020 (r548182) @@ -26,7 +26,7 @@ -X11_LDFLAGS=-L/usr/X11R6/lib -lX11 -lXext + +# Compiler flags. -+SHARED_FLAGS:=-Isource -I./ -I../ $(CFLAGS) ++SHARED_FLAGS:=-Isource -I./ -I../ $(CFLAGS) -fcommon +RELEASE_CFLAGS=$(SHARED_FLAGS) +DEBUG_CFLAGS=$(SHARED_FLAGS) -g -DC_ONLY + @@ -80,7 +80,7 @@ -ifeq ($(wildcard /usr/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) +ifeq ($(strip $(WITH_OPT_CFLAGS)),YES) -+RELEASE_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations ++RELEASE_CFLAGS += -O2 -fno-strict-aliasing -ffast-math +endif + +ifeq ($(strip $(WITH_HOMEDIR)),YES) Modified: head/games/q2p/files/patch-Makefile ============================================================================== --- head/games/q2p/files/patch-Makefile Thu Sep 10 04:04:14 2020 (r548181) +++ head/games/q2p/files/patch-Makefile Thu Sep 10 04:04:40 2020 (r548182) @@ -1,5 +1,5 @@ ---- ./Makefile.orig Sun Dec 31 14:01:34 2006 -+++ ./Makefile Fri Jan 5 15:51:35 2007 +--- Makefile.orig 2006-12-31 17:01:34 UTC ++++ Makefile @@ -9,7 +9,7 @@ # Check OS type. @@ -162,14 +162,25 @@ BASE_CFLAGS+=-I$(LOCALBASE)/include \ -I$(X11BASE)/include \ -@@ -168,15 +165,11 @@ RELEASE_CFLAGS+=$(BASE_CFLAGS) \ +@@ -158,25 +155,18 @@ BASE_CFLAGS+=-I$(LOCALBASE)/include \ + -DGAME_NAME='\"$(GAME_NAME)\"' \ + -DQ2P_VERSION='\"$(VERSION)\"' \ + -DCC_VERSION='\"$(CC_VERSION)\"' \ +- -Wall \ ++ -Wall -fcommon \ + -pipe #-Werror + RELEASE_CFLAGS+=$(BASE_CFLAGS) \ +- -ffloat-store \ + -fno-strict-aliasing \ + -DNDEBUG + ifeq ($(strip $(OPTIMIZE)),YES) RELEASE_CFLAGS+=-O3 \ - -march=$(MARCH) \ -funroll-loops \ - -fstrength-reduce \ - -fexpensive-optimizations \ +- -fstrength-reduce \ +- -fexpensive-optimizations \ - -falign-loops=2 \ - -falign-jumps=2 \ - -falign-functions=2 @@ -230,10 +241,3 @@ @echo @echo "**Built $@ with cflags:" @echo "$(CC) $(CC_VERSION) $(CFLAGS)"; -@@ -935,4 +928,4 @@ bz2: - @tar cjvf $(Q2P_VERSION_BZ2)-$(OSTYPE)-$(DATE).tar.bz2 $(BINDIR) - @printf ".... Done.\n" - -- -\ No newline at end of file -+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009100404.08A44fGo032071>