From nobody Wed Jan 18 09:49:26 2023 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 4Nxgvp3hwNz2skK6; Wed, 18 Jan 2023 09:49:26 +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 4Nxgvp36hYz42pp; Wed, 18 Jan 2023 09:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674035366; 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=nogCmF66DjbFPAjYchSplKww2ZU7DZ41PfQb3k9x7Gw=; b=oeUNlYbl3ClqBvqx4FEubbPbyZAFwLwoW0w4aLTsylPQzq4RdjkDW9GGZ753QigDKykWKu 3soRKiX1DB1usKtRCo16ujwPft6/WCVp9XiCXFYJ6mY5rJ5h4+1xtdsu3A0qDKXTeJ0Ro1 s8uum1HVmNzgQrVlHANbLzx1irJguj8LaToV24SpOWI2jCwxFSy54yDW36HK+0VrF9KRyt zqqWR9qsueIZ3UQ4bADbYqhN89WvVUupyp15ZhBAC0s2nUMLy1nFx5r8S8EOJOM2UfXwxT u2RwsSiY4we7B0SZ1+zqYS2YN+kKyXIHtqKu/G/wVhhxMF0N6aXSuTB/NEPdpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674035366; 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=nogCmF66DjbFPAjYchSplKww2ZU7DZ41PfQb3k9x7Gw=; b=fphyfYsd2/DlSJIjMpeSWpAx9UBoqaT/aYUxFtNhOxwCiHFbWppf2TMhV3qAaLm4kTH3h8 TFY+JJeJB4nrk0j8bPXHNL8Comsby0z/CyeXg67y+REF7Hv0U58d83+D3cwz94bd5NDe2g 2asnFIIlLrmaEiDKNtXE7cXTZL8+kR53ehNomRx+pPZp0QecLICCLaSPM0P1Fx3hgjD7KS oP2NHibXMvVdpxMHU0BJEQxvc7pE/XO4QO4yRD2i1ogcTveEqvOJkPNQ+A5OlFqKLudxx9 N2LnwO80x+hYvtkDS8RCbdoVc4a5Wy0MMt0VGTBP8ZovTxJHLzlCgxzr1akBSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674035366; a=rsa-sha256; cv=none; b=fRq5vG2Hmwz70w92Ajc5K1gHSnsTdMKpBWwIPoHbgDfJduchdIo4CAe3uJjvoMmJSeEqqM MVaUl7UM6FAreEtGg5NvTxhcv6vN+QHqyHLFk7KrZmblGLaNXdK/jzKGCpovHtcrY1m/1I /jRp/C+EsW48sTmBmO8r2hXg2n/xm2y2oTNj9projuF0B15XiQGr4NTpSEluBQuZHD1CLZ 9s80VP99g0ip1YV1EdGP48FICZVxvsygow9Jv/W1VOUd0bXsgoirPADH4/hQdTpGHD3Tnm xyvUMJb8abjezC90yXpb2MOzNDNHg+I+m02mOZ0hkBraYWw1BsdcFqVkBevQdg== 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 4Nxgvp2834z167j; Wed, 18 Jan 2023 09:49:26 +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 30I9nQJQ067972; Wed, 18 Jan 2023 09:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30I9nQTN067971; Wed, 18 Jan 2023 09:49:26 GMT (envelope-from git) Date: Wed, 18 Jan 2023 09:49:26 GMT Message-Id: <202301180949.30I9nQTN067971@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 3c669015beec - main - lang/zig: unbreak Sigaction.handler_fn on aarch64 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c669015beec34e40194d872d8898351af18f3e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c669015beec34e40194d872d8898351af18f3e8 commit 3c669015beec34e40194d872d8898351af18f3e8 Author: Jan Beich AuthorDate: 2023-01-18 09:21:21 +0000 Commit: Jan Beich CommitDate: 2023-01-18 09:48:57 +0000 lang/zig: unbreak Sigaction.handler_fn on aarch64 $ cat test.zig const std = @import("std"); const os = std.os; pub fn main() anyerror!void { // From https://github.com/riverwm/river/blob/v0.2.2/river/main.zig#L97-L104 const sig_ign = os.Sigaction{ .handler = .{ .handler = os.SIG.IGN }, .mask = os.empty_sigset, .flags = 0, }; try os.sigaction(os.SIG.PIPE, &sig_ign, null); } $ zig build-exe -target aarch64-freebsd test.zig /usr/local/lib/zig/std/c/freebsd.zig:702:54: error: pointer type '?*const fn(c_int) callconv(.C) void' requires aligned address pub const IGN = @intToPtr(?Sigaction.handler_fn, 1); ^ referenced by: main: test.zig:7:40 comptime_0: /usr/local/lib/zig/std/start.zig:59:50 remaining reference traces hidden; use '-freference-trace' to see all reference traces Reported by: pkg-fallout (x11-wm/river) Inspired by: Alpine Linux --- lang/zig/Makefile | 7 ++++++- lang/zig/distinfo | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lang/zig/Makefile b/lang/zig/Makefile index 7d9109fd1b52..7c5c7232cb09 100644 --- a/lang/zig/Makefile +++ b/lang/zig/Makefile @@ -1,6 +1,6 @@ PORTNAME= zig DISTVERSION= 0.10.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= lang MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \ https://ziglang.org/builds/ @@ -8,6 +8,11 @@ MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ zig-freebsd-x86_64-${DISTVERSION}${EXTRACT_SUFX} +PATCH_SITES= https://github.com/ziglang/${PORTNAME}/commit/ +PATCHFILES+= 64b3ffd8ffb9.patch:-p1 # https://github.com/ziglang/zig/pull/13418 +PATCHFILES+= 7f1f2e653d6f.patch:-p1 # https://github.com/ziglang/zig/pull/13418 +PATCHFILES+= a68b27c25266.patch:-p1 # https://github.com/ziglang/zig/pull/13418 + MAINTAINER= dch@FreeBSD.org COMMENT= Language designed for robustness, optimality, and maintainability WWW= https://ziglang.org/ diff --git a/lang/zig/distinfo b/lang/zig/distinfo index 94e44d577f59..54b0ddd17f9a 100644 --- a/lang/zig/distinfo +++ b/lang/zig/distinfo @@ -3,3 +3,9 @@ SHA256 (zig-0.10.0.tar.xz) = d8409f7aafc624770dcd050c8fa7e62578be8e6a10956bca3c8 SIZE (zig-0.10.0.tar.xz) = 14530912 SHA256 (zig-freebsd-x86_64-0.10.0.tar.xz) = dd77afa2a8676afbf39f7d6068eda81b0723afd728642adaac43cb2106253d65 SIZE (zig-freebsd-x86_64-0.10.0.tar.xz) = 44056504 +SHA256 (64b3ffd8ffb9.patch) = 82fc22bbd76e5668302d3b207770ecabb225a3faa9f121bc67203532710cdf04 +SIZE (64b3ffd8ffb9.patch) = 2260 +SHA256 (7f1f2e653d6f.patch) = bdfc8a0d7d205a14b10e004d50f6773fc4ff1c89e92936cdd5ef84791036e8e7 +SIZE (7f1f2e653d6f.patch) = 5870 +SHA256 (a68b27c25266.patch) = 0c278d33f6cfeaca0bf9229d4cf8fc43846c0f1d9cb07740f14a6fa35ed24f29 +SIZE (a68b27c25266.patch) = 3387