Date: Sun, 13 Jul 2014 07:46:31 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361658 - in head/games/quake3: . files Message-ID: <201407130746.s6D7kVE6014505@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Jul 13 07:46:31 2014 New Revision: 361658 URL: http://svnweb.freebsd.org/changeset/ports/361658 QAT: https://qat.redports.org/buildarchive/r361658/ Log: games/quake3: Fix build on FreeBSD 11 While here, removed redundant <pre>,<post> and revbump just in case the these flag changes cause executable to change for F10-. PR: 188095 Submitted by: maintainer (Linas Valiukas) Modified: head/games/quake3/Makefile head/games/quake3/files/patch-code-unix-Makefile Modified: head/games/quake3/Makefile ============================================================================== --- head/games/quake3/Makefile Sun Jul 13 07:45:24 2014 (r361657) +++ head/games/quake3/Makefile Sun Jul 13 07:46:31 2014 (r361658) @@ -3,7 +3,7 @@ PORTNAME= quake3 PORTVERSION= 1.32c -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://mancubus.net/pub/idgames/idstuff/source/ \ http://ftp.mancubus.net/pub/idgames/idstuff/source/ \ @@ -39,7 +39,6 @@ REALVERSION= 1.32b VM_ARCHS= i386 powerpc .include <bsd.port.options.mk> -.include <bsd.port.pre.mk> .if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm @@ -116,4 +115,4 @@ do-install: .endif .include "${.CURDIR}/../quake3-data/Makefile.include" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/quake3/files/patch-code-unix-Makefile ============================================================================== --- head/games/quake3/files/patch-code-unix-Makefile Sun Jul 13 07:45:24 2014 (r361657) +++ head/games/quake3/files/patch-code-unix-Makefile Sun Jul 13 07:46:31 2014 (r361658) @@ -40,7 +40,7 @@ NEWPGCC=/loki/global/ppc/bin/gcc CC=$(NEWPGCC) - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ++ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce else #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205 #NEWPGCC=/loki/global/x86/bin/gcc @@ -49,10 +49,10 @@ # NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box # but building on the Mdk 7.2 baseline seems to work - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ++ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce # TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed) -# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ++# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce endif endif @@ -95,11 +95,10 @@ -GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include +ifdef OPTIMIZED_CFLAGS + ifeq ($(ARCH),i386) -+RELEASE_CFLAGS+=-O2 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ++RELEASE_CFLAGS+=-O2 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce + else +RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -+ endif -+endif ++ endif+endif -DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror -ifeq ($(ARCH),axp)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407130746.s6D7kVE6014505>