From nobody Sun Jan 15 13:44:19 2023 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 4NvxGD51nwz2sxm1; Sun, 15 Jan 2023 13:44:20 +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 4NvxGD1T9gz4Wsx; Sun, 15 Jan 2023 13:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673790260; 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=KtmVUXAVYfebGXKHj8zjKRs/PJpDxXm3QJoD5jUOT30=; b=vGpcz4ihrC3qzWYKummJ6OHkw8CYfQi2vb8Sj5LUpYyKqNnUjBSpXGYWdvplyPe6C18LN7 HTNlimY415oOMz0lVH6AkXdCDe8W/GlVIDuz0IAQj+CDot9A/Kt3Ng7N7PpYDtPjp7lIIS kgq3kmnrogZ+GJN5gk0uw80Ns9OtJlN/nBG+jGHSxgkbQYqROK2MM8IxJNCmQVwNgP5Q8A ZsQ1C7Ym9YCzuKUiM2TRfTJ4fFx9vtMYdlDcXe/vNL3FU9ogxzPyEg0+WJsTe5J0CCaeW4 7IdtmfJdJatZhUMAdoCkQ/AQUYb7Ah/Pa34qWYEL4bGQt7LVKJJInIfWSSmBHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673790260; 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=KtmVUXAVYfebGXKHj8zjKRs/PJpDxXm3QJoD5jUOT30=; b=T+TWek0vQyhwrwLOhgBoCuE1oEYesUTqoq1z4L/F1zGPvlhI41LtIKKw9dfPymzh/lCWeR Tp1p6m5Czo9F3Q7lsQZ+fj8cWnhx7zwyzvD6OIrN3N6D4yBm7jO1a8CACFGsy7PG9Xe3hQ MRNPVBSJz5c0DnPbOpyypZzO6nbSLFKDamkK6zR/uLNjpg8l0OInLT3z5tBlzWs+gEmuzg JyNrOCE/1xijmD2WRtDkKhZ2XfEaaQhgvkE8jTt6EmSKNK+zRP0ObDi5IEuPmGAst4agif jeEXUtGUbw56EIBTy9LiXzTHy/V0OLinj+Bf/i4NRy1OzugL7S60LPOWTDDy4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673790260; a=rsa-sha256; cv=none; b=d0iMWFXekmWofM146PKnKgVYThwJcozkBJGzFsG6Vnu2JF/WJMT+/nNSFkHQmN7LcIYxIO +RTiZk46SZn2SWEqpkmwljZh+IHK/QvZ5ReuhT5YFO/wrh1Dl9Ax1ZdUg4VHS4rSnCpcZ5 vCznuXvAkyxSO5icHDVrMA5UceBkLQ8liAtNVhkKUTvZH3P9znb9XvA8kj2Bs8Kju85gGY v+yLzfqU2W3T14Z4UdSJG1h/mN4JFbQguoNkr+K1xNqDLfAgsbxVM+FpxQG+YVo092morg J8nffGEZLC+kCoBOyzVsMvpiMyT7CZcZhgluQyGiy4QVMquY0S2leDklaI8HXw== 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 4NvxGD0ZcTzTRW; Sun, 15 Jan 2023 13:44:20 +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 30FDiJYQ014180; Sun, 15 Jan 2023 13:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FDiJ9Z014179; Sun, 15 Jan 2023 13:44:19 GMT (envelope-from git) Date: Sun, 15 Jan 2023 13:44:19 GMT Message-Id: <202301151344.30FDiJ9Z014179@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: 75a1d429216a - main - editors/lapce: Fix aarch64 build 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: 75a1d429216aa977d1bf6b1f4a9c5eb4eb474ac8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=75a1d429216aa977d1bf6b1f4a9c5eb4eb474ac8 commit 75a1d429216aa977d1bf6b1f4a9c5eb4eb474ac8 Author: Nuno Teixeira AuthorDate: 2023-01-15 13:40:21 +0000 Commit: Nuno Teixeira CommitDate: 2023-01-15 13:40:21 +0000 editors/lapce: Fix aarch64 build - Fix aarch64 build: wasmtime-runtime-1.0.2 crate See: https://github.com/bytecodealliance/wasmtime/issues/5499 PR: 268929 Tested by: Robert Clausecker --- editors/lapce/Makefile | 2 +- ...crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile index 054ab47e1960..8130c654882f 100644 --- a/editors/lapce/Makefile +++ b/editors/lapce/Makefile @@ -1,7 +1,7 @@ PORTNAME= lapce DISTVERSIONPREFIX= v DISTVERSION= 0.2.5 # remove openssl-src-* from CARGO-CRATES each update -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MAINTAINER= eduardo@FreeBSD.org diff --git a/editors/lapce/files/patch-cargo-crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs b/editors/lapce/files/patch-cargo-crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs new file mode 100644 index 000000000000..6061e8861b3d --- /dev/null +++ b/editors/lapce/files/patch-cargo-crates_wasmtime-runtime-1.0.2_src_traphandlers_unix.rs @@ -0,0 +1,15 @@ +--- cargo-crates/wasmtime-runtime-1.0.2/src/traphandlers/unix.rs.orig 2023-01-13 13:01:32 UTC ++++ cargo-crates/wasmtime-runtime-1.0.2/src/traphandlers/unix.rs +@@ -228,6 +228,12 @@ unsafe fn get_pc_and_fp(cx: *mut libc::c_void, _signum + cx.uc_mcontext.mc_rip as *const u8, + cx.uc_mcontext.mc_rbp as usize, + ) ++ } else if #[cfg(all(target_os = "freebsd", target_arch = "aarch64"))] { ++ let cx = &*(cx as *const libc::mcontext_t); ++ ( ++ cx.mc_gpregs.gp_elr as *const u8, ++ cx.mc_gpregs.gp_x[29] as usize, ++ ) + } else { + compile_error!("unsupported platform"); + }