Date: Tue, 16 Apr 2019 03:58:59 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499072 - in head/games/quake2lnx: . files Message-ID: <201904160358.x3G3wxia005290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904160358.x3G3wxia005290>