From owner-svn-ports-head@freebsd.org Thu Jan 21 15:47:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7CD9A8AEA0; Thu, 21 Jan 2016 15:47:49 +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 mx1.freebsd.org (Postfix) with ESMTPS id 82B9D19F9; Thu, 21 Jan 2016 15:47:49 +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 u0LFlmib076560; Thu, 21 Jan 2016 15:47:48 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LFlmaV076557; Thu, 21 Jan 2016 15:47:48 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201601211547.u0LFlmaV076557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 21 Jan 2016 15:47:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406864 - in head/games/mvdsv: . files X-SVN-Group: ports-head 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.20 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, 21 Jan 2016 15:47:49 -0000 Author: danfe Date: Thu Jan 21 15:47:48 2016 New Revision: 406864 URL: https://svnweb.freebsd.org/changeset/ports/406864 Log: Don't build with `-ffast-math -funroll-loops' flags by default: contemporary compilers should be smart enough to generate good code of of the box without potentially unsafe fast-math, and remove standard `-O2 -fno-strict-aliasing' options from the "optimized flags". Modified: head/games/mvdsv/Makefile head/games/mvdsv/files/patch-build_make_Makefile.BSD head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD Modified: head/games/mvdsv/Makefile ============================================================================== --- head/games/mvdsv/Makefile Thu Jan 21 15:42:42 2016 (r406863) +++ head/games/mvdsv/Makefile Thu Jan 21 15:47:48 2016 (r406864) @@ -21,6 +21,7 @@ MAKE_ARGS= UNAME=${OPSYS} PLIST_FILES= bin/${PORTNAME} +OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIONS_DEFINE_i386= ASM OPTIONS_DEFINE_amd64= ASM OPTIONS_DEFAULT_i386= ASM @@ -35,6 +36,7 @@ KQUEUE_DESC= Kqueue support KQUEUE_MAKE_ARGS_OFF= -DNOKQUEUE ASM_MAKE_ARGS_OFF= -DWITHOUT_X86_ASM +OPTIMIZED_CFLAGS_MAKE_ARGS= -DWITH_OPTIMIZED_CFLAGS post-patch: @${REINPLACE_CMD} -e 's,^inline ,,' ${WRKSRC}/src/sv_sys_unix.c Modified: head/games/mvdsv/files/patch-build_make_Makefile.BSD ============================================================================== --- head/games/mvdsv/files/patch-build_make_Makefile.BSD Thu Jan 21 15:42:42 2016 (r406863) +++ head/games/mvdsv/files/patch-build_make_Makefile.BSD Thu Jan 21 15:47:48 2016 (r406864) @@ -1,6 +1,6 @@ --- build/make/Makefile.BSD.orig 2011-10-06 07:24:17 UTC +++ build/make/Makefile.BSD -@@ -17,7 +17,7 @@ SV_DIR = ../../src +@@ -17,17 +17,15 @@ SV_DIR = ../../src # for gcc its like: make mvdsv FORCE32BITFLAGS=-m32 # configure script add FORCE32BITFLAGS=-m32 @@ -9,7 +9,18 @@ .if !defined(NOKQUEUE) && (${UNAME} == "FreeBSD" || ${UNAME} == "DragonFly") DO_CFLAGS += -DKQUEUE -@@ -94,7 +94,7 @@ SV_OBJS = \ + .endif + +-WITH_OPTIMIZED_CFLAGS = YES +- + USE_ASM=-Did386 + .if defined(WITH_OPTIMIZED_CFLAGS) +-DO_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -funroll-loops ++DO_CFLAGS += -ffast-math -funroll-loops + . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) + ASM=${USE_ASM} + DO_CFLAGS += ${ASM} +@@ -94,7 +92,7 @@ SV_OBJS = \ ${SV_DIR}/pcre/get.o \ ${SV_DIR}/pcre/pcre.o @@ -18,7 +29,7 @@ SV_ASM_OBJS = \ ${SV_DIR}/bothtoolsa.o \ ${SV_DIR}/math.o -@@ -105,10 +105,10 @@ SV_ASM_OBJS = \ +@@ -105,10 +103,10 @@ SV_ASM_OBJS = \ ############################################################################# .c.o: Modified: head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD ============================================================================== --- head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD Thu Jan 21 15:42:42 2016 (r406863) +++ head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD Thu Jan 21 15:47:48 2016 (r406864) @@ -1,6 +1,6 @@ --- tools/qwdtools/source/Makefile.BSD.orig 2011-10-06 07:24:17 UTC +++ tools/qwdtools/source/Makefile.BSD -@@ -12,18 +12,14 @@ +@@ -12,24 +12,18 @@ # MAINDIR = ../../.. @@ -17,11 +17,18 @@ -.if !defined(NOKQUEUE) && (${UNAME} == "FreeBSD" || ${UNAME} == "DragonFly") -DO_CFLAGS += -DKQUEUE -.endif +- +-WITH_OPTIMIZED_CFLAGS = YES +DO_CFLAGS = ${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 ${FORCE32BITFLAGS} - WITH_OPTIMIZED_CFLAGS = YES - -@@ -60,7 +56,7 @@ QWDTOOLS_OBJS = \ + USE_ASM=-Did386 + .if defined(WITH_OPTIMIZED_CFLAGS) +-DO_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -funroll-loops ++DO_CFLAGS += -ffast-math -funroll-loops + . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) + ASM=${USE_ASM} + DO_CFLAGS += ${ASM} +@@ -60,7 +54,7 @@ QWDTOOLS_OBJS = \ ${QWDTOOLS_DIR}/sync.o \ ${QWDTOOLS_DIR}/tools.o @@ -30,7 +37,7 @@ QWDTOOLS_ASM_OBJS = \ ${SV_DIR}/bothtoolsa.o .endif -@@ -70,10 +66,10 @@ QWDTOOLS_ASM_OBJS = \ +@@ -70,10 +64,10 @@ QWDTOOLS_ASM_OBJS = \ ############################################################################# .c.o: