From nobody Mon Mar 13 08:36:03 2023 X-Original-To: dev-commits-ports-branches@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 4PZqkD1S53z3xNt3; Mon, 13 Mar 2023 08:36:04 +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 4PZqkD0k1rz3CSq; Mon, 13 Mar 2023 08:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678696564; 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=Hm49KC0YB1Hea6peG8Yebx4qKrWFodOvGryGPfJKrRQ=; b=Nh2MM2KTK50ZVkOqTo5c6dWiS5jgmic/fso5DISW+mtjznOxcY+hpkxqVmsxDg3lIl/r7I f4xKbWxfOrjcrHxbG/0A/mAs+iAYxUZisDkObexQdscT3Ossc0YsFA0S+ewgsGhHNd4awG xn7uFio+rDa63Gionz+0Ml3Nc1CBa7Fp6aorAuOP/ctsVmxF7xTzgUtFfecrhwVgsopY+E xU9YtUW/q3KaYFKgBbFvgOyQXyCwbdF8ompPIKHg374PX4rjFjMwECJ0kNWBw9Vizl9rIz PnvSRFCjVxDqJ9v0YF1CZbDTIJLKQWp0mqj+txZJBkmA1qaq5vLHr7V0IM7sgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678696564; 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=Hm49KC0YB1Hea6peG8Yebx4qKrWFodOvGryGPfJKrRQ=; b=QuvyfWB1ul2OiAUVzCdUeN+U8YJrAsVh6e6BFbHQQhm3zbrIwas/yigFyKb8seoHhXulgD lf6rDRIWU1VMVMKhKTrQbQqAbhcEvxFtTvTAcC/2NCcOn6l7cOKx23ID7tWMwuVM9RBIsQ m4oU2dXhKPn0iDrb+xTFotmhlQbNbVHEbtAzyM3rhOQcvDbtIe4xDs98ibvld2pI0H4p0J NsQajxvMYHDIUmmcV884qdIyyxv3WXUlPY3pu/8WYxgKJeWKeZjj3kWZQGD+gHNNAQMP0u KxLpgxQI6HhSRRPYzJwHobzb2ynQay0N4NGjV6Tau/JZXC8KKls44dUjnU7Glg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678696564; a=rsa-sha256; cv=none; b=n1f/3THR4pVe09jb+tQu3p+h/EtXbwb3wg/TmPfFDSc8UckCx75PvLnMxdafRhAxV5vM9L wFcoKifo+Q8/lkdmqQQ3v+b7hGJDc3Xh0FkmJloPFUKQL/rXGl+A+Timv5IGPTPCQjOsVt l2SUXMEfhYAgahugpp2fSH/Hx8Uw6AIsYwYnw+jYzQ2zVYnCGP61v9wCG4hUiC4Y5ENFNn UCppYqyttTcp/AhBwQb38zn972WPv8uL/Dsxek0MACU/CXXcRG8Jw28uAW617stED/f5FT yXAM25DpXXLtDp8I2NtAtzH5IyaY3wav2c4ZERzrkUuiVON3axdUvUwc0Pzscg== 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 4PZqkC6vCSzmRT; Mon, 13 Mar 2023 08:36:03 +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 32D8a3JL017979; Mon, 13 Mar 2023 08:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32D8a39n017978; Mon, 13 Mar 2023 08:36:03 GMT (envelope-from git) Date: Mon, 13 Mar 2023 08:36:03 GMT Message-Id: <202303130836.32D8a39n017978@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 3fd626858d82 - 2023Q1 - devel/rgbds: Fix build on 12.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 3fd626858d826cbdbcc365a60ce34cc88287ac5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fd626858d826cbdbcc365a60ce34cc88287ac5b commit 3fd626858d826cbdbcc365a60ce34cc88287ac5b Author: Nuno Teixeira AuthorDate: 2023-03-13 08:01:20 +0000 Commit: Nuno Teixeira CommitDate: 2023-03-13 08:09:18 +0000 devel/rgbds: Fix build on 12.4 Fix build on 12.4 using gcc because port only builds with clang <=10. MFH: 2023Q1 (build fixes) (cherry picked from commit 526802d9024cb7efee0c95372a4f283a8a578b2a) --- devel/rgbds/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/devel/rgbds/Makefile b/devel/rgbds/Makefile index 043e1985bd4b..3685a85a54d7 100644 --- a/devel/rgbds/Makefile +++ b/devel/rgbds/Makefile @@ -1,5 +1,6 @@ PORTNAME= rgbds DISTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= https://github.com/gbdev/rgbds/releases/download/v${DISTVERSION}/ @@ -13,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png USES= bison compiler:c11 dos2unix pkgconfig +USE_GCC= yes # clang >10 fails to build, https://github.com/gbdev/rgbds/issues/1091 MAKE_ARGS= Q= # verbose builds WRKSRC= ${WRKDIR}/rgbds @@ -22,12 +24,4 @@ do-configure: ${CC} -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE -xc - 2>/dev/null || \ ${REINPLACE_CMD} 's,-D_POSIX_C_SOURCE=200809L,,' ${WRKSRC}/Makefile -.include - -# clang build fails on 13.1 and 14 current -# see https://github.com/gbdev/rgbds/issues/1091 -.if ${OSVERSION} >= 1300000 -USE_GCC= yes -.endif - -.include +.include