From nobody Tue Nov 23 13:56:21 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E7864188D968; Tue, 23 Nov 2021 13:56:21 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hz5K150SMz3wLW; Tue, 23 Nov 2021 13:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7DB7517844; Tue, 23 Nov 2021 13:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ANDuLZP085651; Tue, 23 Nov 2021 13:56:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANDuLV7085650; Tue, 23 Nov 2021 13:56:21 GMT (envelope-from git) Date: Tue, 23 Nov 2021 13:56:21 GMT Message-Id: <202111231356.1ANDuLV7085650@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 58ce8baa9d09 - main - games/r1q2: unbreak the build on recent -CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58ce8baa9d0915ddbb1f0303d845007327fbd1cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637675781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5xiqGWeQOZE3MTmajDGm9btoMCZNm3CNimD2WcCRSw=; b=lknwyNhLW4Xb08iXKLWemIOohHIBcQuTC8NljlCB6VikUDiBm2UlhuvJtdEu4p8eQuD7e3 fdzmZRU8Fy2qdX70DwgjDACcq4vGtHK8GYSHAhjtngUcDsdLe90b/auvfkK9cADgThiVju nSTR/lRoWzMeZOg/ZvzKDHrH9krkxbhgHQ+uQbNsmevPo0gA8lLDn/yDS/IgtT4BmVSAog ZHyQbnmEqmZVcOCfF4FlgVH1sxRAhrmazTUNSGZOKCan5/SN+NTpIExqL9C/f9l2vkEBwv wJRD/Q7dO0pKw5fve167Hhd4zTQiZRTHKmXcKtYamZlWR/l4Sn/zoZQ19GYVWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637675781; a=rsa-sha256; cv=none; b=VEEPHpMlkgvhypetj1XaoKAhs+g/I1AWUVhPYpGEXpgmgDyyP7Zs4CJUCoF+2sHyBs6Q5u FBrPCDCNuoEovGpCFCg2gAzrZytG10q9Hd9aN56bP4yHom4O2KD8Z7a+YWHazl4pMJJOKL zFVbCZoynPZ9wAcwEasJI5edP8jKNc6aTh5ES1GQgNVsn7qeeGNIAJP54esRdpJIHdpfIV hM1G/8k1BYZz9Jj7GvgVsPZZeldXQNBHloIDuu1x5PwuNkZ9upjy4amwc1cl6IVvsIpwWQ DjmZGzLchcVghAM7ctYNiZTREyh3OnAbQVPmY/X75cvcDDYUcdU7DE8+OE9Gag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=58ce8baa9d0915ddbb1f0303d845007327fbd1cf commit 58ce8baa9d0915ddbb1f0303d845007327fbd1cf Author: Alexey Dokuchaev AuthorDate: 2021-11-23 13:55:08 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-11-23 13:55:08 +0000 games/r1q2: unbreak the build on recent -CURRENT Something had been changed in our toolchain which broke linking of this port because `SV_FixPlayerSkin' symbol became undefined. This function was annotated as `__inline', change it to `static' to unbreak the build as it is defined and called within a single file only. While here, remove unsupported optimization flag from the CFLAGS. Reported by: pkg-fallout --- games/r1q2/Makefile | 2 ++ games/r1q2/files/patch-binaries__make.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index b1f795e7e2d4..a452fe8547f2 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -71,6 +71,8 @@ PLIST_SUB+= REF_GL="@comment " post-patch: @${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \ ${BUILD_WRKSRC}/game/Makefile + @${REINPLACE_CMD} -e '/SV_FixPlayerSkin/s,__inline,static,' \ + ${WRKSRC}/server/sv_game.c pre-build: @${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \; diff --git a/games/r1q2/files/patch-binaries__make.inc b/games/r1q2/files/patch-binaries__make.inc index 7d0b61a4074c..5deef51b12fe 100644 --- a/games/r1q2/files/patch-binaries__make.inc +++ b/games/r1q2/files/patch-binaries__make.inc @@ -2,7 +2,7 @@ +++ binaries/make.inc Fri Sep 28 21:37:31 2007 @@ -1,5 +1,6 @@ -CFLAGS+=-DNDEBUG -DLINUX -O2 -fno-strict-aliasing -Wall -ffloat-store -pipe -g -MF .depends/$*.d -MMD -+CFLAGS+=-I$(LOCALBASE)/include -DNDEBUG -DLINUX -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' -O2 -fno-strict-aliasing -Wall -ffloat-store -pipe -g -MF .depends/$*.d -MMD ++CFLAGS+=-I$(LOCALBASE)/include -DNDEBUG -DLINUX -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' -O2 -fno-strict-aliasing -Wall -pipe -g -MF .depends/$*.d -MMD ALLOBJ:=$(ALLSRC:.c=.o) +LDFLAGS+=-L$(LOCALBASE)/lib