From nobody Thu Dec 01 21:17:33 2022 X-Original-To: dev-commits-ports-main@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 4NNTRx4wycz4jMZw; Thu, 1 Dec 2022 21:17:33 +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 4NNTRx4Lqsz3PGv; Thu, 1 Dec 2022 21:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669929453; 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=yy1Nr+ePS8ip8+YuizeQC+fopiJbSrC74vm1aE4y+ZU=; b=F+oCvh02BdZQMK4itrtouJDjKJTx7ZsbXheRA85C76yYJh2NzMpS4/BhD3RDbmx7c+NhsR uDY34rzsz7LoJquW3QEDLa2rbLqlF93qXZ71efXVM/ilJ/o4GxBDPS06qaQG+gygYgtt6h MohEkQOsWWxqV1h1ZD4RnX7mFhgkpn48+68kS+ViNWkjptSxahNH92FVf5ltiQRLZWC4c2 9lY6c9BRDRWrhX0cAUZ/71U7R9RjTxqK3FspjoSGRy6xM/bmANy4vCRNeLdFCUJoka4JwI NMLXMeOO7HFRZGQU0eyJaTe/enujHR2lDrnzaTAhHuWQqQoLQVX8fvZJ9915Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669929453; 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=yy1Nr+ePS8ip8+YuizeQC+fopiJbSrC74vm1aE4y+ZU=; b=f0BuypsnMev7Pc80pYmIjrFz+HZ480ftuTvzbe5IKoAdAc1rWeGqVwS9Ovtymxc+xZSOdo 24UqdZ43x1DrjynuB47c0hWf2PajX/T/Gwr93UrkUNm2WQZvDgdCka8VLqnOqHXgIjL7BN rZ+GYbA+2JBn3egNH7Dz4b4KJRvkum6cL/qB1CgWhSsHjLuVetHoKws/LsXg3jrK17c3jI arrey+El7AZe8e6C0qKeCTgBk/JxqKQPSxbe1DSpJmhPaiBlUD6Rs+CKxo7NTrM+L4J9uN pCdB86AcnUdvHD1IAXf8mEQlTokiNJMV7v1XenVUJNPbNJ7ryzn/i54o9Cje3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669929453; a=rsa-sha256; cv=none; b=AfCX2gncKKeYB0G0HlzzxH9cy8ilb4G9gXCXWNNHz4VoU7Vb3aJAkRu3ogrmK1oRF/u3c8 b3bM9zPNGvV4TXpTdyOTuYW+0huzPLyrauyO5R4XUbAYWzbuausGUKVsyRH2ySrSrt8KJb OHJMc1G1yBwWE8YOg397t429x4dIuwPqFae0gFvar+0aYs+s4KjvN2ouxVDegJCECP9WuK 9yOWS/+AmUS1Lp5tbU48mANHb0zGr6GNSbCTFhAIPx216qCCWUw/uv57RGXr7JOhGJhQiB T6K3Lape79FKXPV6C61e1LQ7xjI9HA1ih1SYhyG8yJyB4tLnYw5ZDW68diCioQ== 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 4NNTRx3Nv0zr22; Thu, 1 Dec 2022 21:17:33 +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 2B1LHXK8061786; Thu, 1 Dec 2022 21:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1LHXlL061785; Thu, 1 Dec 2022 21:17:33 GMT (envelope-from git) Date: Thu, 1 Dec 2022 21:17:33 GMT Message-Id: <202212012117.2B1LHXlL061785@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 4b93307b9d17 - main - games/libretro-beetle_psx: Fix build on armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 4b93307b9d1762c72e68c229301795c8ebdc79fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b93307b9d1762c72e68c229301795c8ebdc79fc commit 4b93307b9d1762c72e68c229301795c8ebdc79fc Author: Robert Clausecker AuthorDate: 2022-12-01 21:12:04 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-01 21:17:05 +0000 games/libretro-beetle_psx: Fix build on armv7 The functions __addsf3 and __adddf3 are part of libgcc which is not provided when compiling with clang. Fiddle with some #if directives to provide shims if we compile with clang. PR: 268077 MFH: 2022Q4 (build fix) --- games/libretro-beetle_psx/Makefile | 10 ++++++++-- .../files/patch-deps_lightning_lib_jit__arm-swf.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/games/libretro-beetle_psx/Makefile b/games/libretro-beetle_psx/Makefile index 51ea9c4f534f..f39260e485cc 100644 --- a/games/libretro-beetle_psx/Makefile +++ b/games/libretro-beetle_psx/Makefile @@ -1,6 +1,6 @@ PORTNAME= libretro-beetle_psx PORTVERSION= 0.20220211 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= ports@FreeBSD.org @@ -20,8 +20,14 @@ GH_TAGNAME= 88929ae PLIST_FILES= lib/libretro/mednafen_psx_libretro.so +.include + +.if ${ARCH:Marmv?} +USE_GCC= yes:build +.endif + do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro; ${INSTALL_LIB} ${WRKSRC}/mednafen_psx_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro; -.include +.include diff --git a/games/libretro-beetle_psx/files/patch-deps_lightning_lib_jit__arm-swf.c b/games/libretro-beetle_psx/files/patch-deps_lightning_lib_jit__arm-swf.c new file mode 100644 index 000000000000..6e2cdfe00c4e --- /dev/null +++ b/games/libretro-beetle_psx/files/patch-deps_lightning_lib_jit__arm-swf.c @@ -0,0 +1,20 @@ +--- deps/lightning/lib/jit_arm-swf.c.orig 2022-11-30 10:43:45 UTC ++++ deps/lightning/lib/jit_arm-swf.c +@@ -402,7 +402,7 @@ static void _swf_vaarg_d(jit_state_t*, jit_int32_t, ji + BICI(rt, rn, encode_arm_immediate(im)); \ + } while (0) + +-#if !defined(__GNUC__) ++#if !defined(__GNUC__) || defined(__llvm__) + float __addsf3(float u, float v) + { + return (u + v); +@@ -414,6 +414,8 @@ __adddf3(double u, double v) + return (u + v); + } + ++#endif ++#if !defined(__GNUC__) + float + __aeabi_fsub(float u, float v) + {