From owner-svn-ports-all@freebsd.org Wed Sep 23 17:16:11 2020 Return-Path: Delivered-To: svn-ports-all@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 1D44D3FF6F9; Wed, 23 Sep 2020 17:16:11 +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 4BxPwB73Hrz3djy; Wed, 23 Sep 2020 17:16:10 +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 D4CEC1413C; Wed, 23 Sep 2020 17:16:10 +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 08NHGA7F060763; Wed, 23 Sep 2020 17:16:10 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NHGACf060762; Wed, 23 Sep 2020 17:16:10 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009231716.08NHGACf060762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 23 Sep 2020 17:16:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549756 - head/games/quake2max/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/games/quake2max/files X-SVN-Commit-Revision: 549756 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 17:16:11 -0000 Author: danfe Date: Wed Sep 23 17:16:10 2020 New Revision: 549756 URL: https://svnweb.freebsd.org/changeset/ports/549756 Log: 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 Modified: head/games/quake2max/files/patch-Makefile Modified: head/games/quake2max/files/patch-Makefile ============================================================================== --- head/games/quake2max/files/patch-Makefile Wed Sep 23 17:15:13 2020 (r549755) +++ head/games/quake2max/files/patch-Makefile Wed Sep 23 17:16:10 2020 (r549756) @@ -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