From owner-svn-ports-head@freebsd.org Thu Sep 10 04:04:41 2020 Return-Path: Delivered-To: svn-ports-head@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 CB4063E93F4; Thu, 10 Sep 2020 04:04:41 +0000 (UTC) (envelope-from danfe@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bn4yx53D0z4Q1r; Thu, 10 Sep 2020 04:04:41 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77EA3CC5A; Thu, 10 Sep 2020 04:04:41 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08A44faj032072; Thu, 10 Sep 2020 04:04:41 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08A44fGo032071; Thu, 10 Sep 2020 04:04:41 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009100404.08A44fGo032071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 10 Sep 2020 04:04:41 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/games: egl/files q2p/files X-SVN-Commit-Revision: 548182 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2020 04:04:41 -0000 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 -+