From owner-svn-ports-head@freebsd.org Tue Apr 16 03:59:00 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51B961587A89; Tue, 16 Apr 2019 03:59:00 +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) server-signature RSA-PSS (4096 bits) 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 E546C718FA; Tue, 16 Apr 2019 03:58:59 +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 C18531A20C; Tue, 16 Apr 2019 03:58:59 +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 x3G3wxD4005291; Tue, 16 Apr 2019 03:58:59 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3G3wxia005290; Tue, 16 Apr 2019 03:58:59 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201904160358.x3G3wxia005290@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 16 Apr 2019 03:58:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499072 - in head/games/quake2lnx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/games/quake2lnx: . files X-SVN-Commit-Revision: 499072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E546C718FA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 16 Apr 2019 03:59:00 -0000 Author: danfe Date: Tue Apr 16 03:58:59 2019 New Revision: 499072 URL: https://svnweb.freebsd.org/changeset/ports/499072 Log: - Do not suppress -Wall from default CFLAGS, it is always good to see if the code needs some attention, and move macro definition behind other flags - Fix the build against the LLD linker on i386 when using optimized assembly routines by allowing relocations in read-only segments (normally, Quake II builds its shared libraries with -fPIC and they link fine except these few files written in assembly) PR: 234866 Submitted by: emaste Modified: head/games/quake2lnx/Makefile head/games/quake2lnx/files/patch-Makefile Modified: head/games/quake2lnx/Makefile ============================================================================== --- head/games/quake2lnx/Makefile Tue Apr 16 03:43:25 2019 (r499071) +++ head/games/quake2lnx/Makefile Tue Apr 16 03:58:59 2019 (r499072) @@ -205,6 +205,10 @@ post-patch: .SILENT ${REINPLACE_CMD} -e '/BUILDSTRING/s|Linux|${OPSYS}|' \ -e '/CPUSTRING/s|Unknown|${ARCH}|' \ ${WRKSRC}/src/qcommon/qcommon.h +.if ${PORT_OPTIONS:MASM} + ${REINPLACE_CMD} -e '/^SHLIBLDFLAGS/s|$$| -Wl,-z,notext|' \ + ${WRKSRC}/Makefile +.endif do-install: .for tgt in ${EXE_TARGETS} Modified: head/games/quake2lnx/files/patch-Makefile ============================================================================== --- head/games/quake2lnx/files/patch-Makefile Tue Apr 16 03:43:25 2019 (r499071) +++ head/games/quake2lnx/files/patch-Makefile Tue Apr 16 03:58:59 2019 (r499072) @@ -122,7 +122,7 @@ NULL_DIR=$(MOUNT_DIR)/null -BASE_CFLAGS=-Wall -pipe -Dstricmp=strcasecmp -+BASE_CFLAGS=-pipe -Dstricmp=strcasecmp $(CFLAGS) ++BASE_CFLAGS=-Wall $(CFLAGS) -Dstricmp=strcasecmp ifeq ($(HAVE_IPV6),YES) BASE_CFLAGS+= -DHAVE_IPV6 ifeq ($(OSTYPE),FreeBSD)