From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AED95158020 for ; Tue, 18 Oct 2022 15:00:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1CF3E09AE; Tue, 18 Oct 2022 15:00:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D58B4E09AE for ; Tue, 18 Oct 2022 15:00:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B72A8340F87 for ; Tue, 18 Oct 2022 15:00:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 545466A1 for ; Tue, 18 Oct 2022 15:00:51 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1666105245.b15d873b0f867c6b2fe6c763bf859ea79ea41074.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/files/, dev-lang/zig/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/zig/files/zig-0.9.1-fix-clang16.patch dev-lang/zig/zig-0.9.1-r2.ebuild dev-lang/zig/zig-0.9.1-r3.ebuild X-VCS-Directories: dev-lang/zig/files/ dev-lang/zig/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b15d873b0f867c6b2fe6c763bf859ea79ea41074 X-VCS-Branch: master Date: Tue, 18 Oct 2022 15:00:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86f86f8c-bab7-4bec-8566-0edfc95f552b X-Archives-Hash: f38d958ff3444be98e87d65a96a1092d commit: b15d873b0f867c6b2fe6c763bf859ea79ea41074 Author: Eric Joldasov getgoogleoff me> AuthorDate: Mon Oct 10 03:16:41 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Oct 18 15:00:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15d873b dev-lang/zig: fix building with Clang 16, fix searching LLD Upstream PR https://github.com/ziglang/zig/pull/13121 Closes: https://bugs.gentoo.org/877231 Signed-off-by: Eric Joldasov getgoogleoff.me> Closes: https://github.com/gentoo/gentoo/pull/27718 Signed-off-by: Michał Górny gentoo.org> dev-lang/zig/files/zig-0.9.1-fix-clang16.patch | 23 ++++++++++++++++++++++ .../{zig-0.9.1-r2.ebuild => zig-0.9.1-r3.ebuild} | 2 ++ 2 files changed, 25 insertions(+) diff --git a/dev-lang/zig/files/zig-0.9.1-fix-clang16.patch b/dev-lang/zig/files/zig-0.9.1-fix-clang16.patch new file mode 100644 index 000000000000..deb563378d76 --- /dev/null +++ b/dev-lang/zig/files/zig-0.9.1-fix-clang16.patch @@ -0,0 +1,23 @@ +From: Eric Joldasov +Fix building with Clang 16 +Upstream PR https://github.com/ziglang/zig/pull/13121 + +--- a/src/stage1/parse_f128.c ++++ b/src/stage1/parse_f128.c +@@ -983,14 +983,14 @@ static int isspace(int c) + return c == ' ' || (unsigned)c-'\t' < 5; + } + +-static inline float128_t makeInf128() { ++static inline float128_t makeInf128(void) { + union ldshape ux; + ux.i2.hi = 0x7fff000000000000UL; + ux.i2.lo = 0x0UL; + return ux.f; + } + +-static inline float128_t makeNaN128() { ++static inline float128_t makeNaN128(void) { + uint64_t rand = 0UL; + union ldshape ux; + ux.i2.hi = 0x7fff000000000000UL | (rand & 0xffffffffffffUL); diff --git a/dev-lang/zig/zig-0.9.1-r2.ebuild b/dev-lang/zig/zig-0.9.1-r3.ebuild similarity index 94% rename from dev-lang/zig/zig-0.9.1-r2.ebuild rename to dev-lang/zig/zig-0.9.1-r3.ebuild index 4adbe994a8f3..463cead06e2d 100644 --- a/dev-lang/zig/zig-0.9.1-r2.ebuild +++ b/dev-lang/zig/zig-0.9.1-r3.ebuild @@ -23,6 +23,7 @@ IUSE="test +threads" RESTRICT="!test? ( test )" PATCHES=( + "${FILESDIR}/${P}-fix-clang16.patch" "${FILESDIR}/${P}-fix-single-threaded.patch" "${FILESDIR}/${P}-fix-riscv.patch" "${FILESDIR}/${P}-fix-bad-hostname-segfault.patch" @@ -59,6 +60,7 @@ src_configure() { -DZIG_USE_CCACHE=OFF -DZIG_PREFER_CLANG_CPP_DYLIB=ON -DZIG_SINGLE_THREADED="$(usex !threads)" + -DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT}) ) cmake_src_configure