From d1262423b614597cd55d30370eb8de6bfa8f0899 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Oct 2022 19:56:57 +0100 Subject: gentoo auto-resync : 18:10:2022 - 19:56:57 --- dev-lang/zig/Manifest | 3 +- dev-lang/zig/files/zig-0.9.1-fix-clang16.patch | 23 ++++++++ dev-lang/zig/zig-0.9.1-r2.ebuild | 70 ------------------------- dev-lang/zig/zig-0.9.1-r3.ebuild | 72 ++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 71 deletions(-) create mode 100644 dev-lang/zig/files/zig-0.9.1-fix-clang16.patch delete mode 100644 dev-lang/zig/zig-0.9.1-r2.ebuild create mode 100644 dev-lang/zig/zig-0.9.1-r3.ebuild (limited to 'dev-lang/zig') diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index 492943e78d59..0bb7391c8c65 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,8 +1,9 @@ AUX zig-0.9.1-fix-bad-hostname-segfault.patch 935 BLAKE2B c1c54ccf40b4db9a8f9f68991e1ebafd81c2b996b41bd904ef842f5feed2d4ec19d61960ed1bda95873cb04a9fc58df7daa5d311537c9711f5100fb095eeb6db SHA512 c620da70b632e5a85d3136d6d54e42fe905ce8b5d899ca5ca9423ac7e7eaff036eea1f90a925c244794c0505469bf1320f5fd5d19d465c66505154ca78bcf519 +AUX zig-0.9.1-fix-clang16.patch 687 BLAKE2B db8601a4a889c8e0d740d68ebd825ab0a49afbf64e4fd391a2ea2c8ba0a86fb4b036e8d5ca5a23852e7de5214f804a1288e5dd39f3cc691adb571a3c0feae822 SHA512 00b27a4032ef27b627f2954549998901067a6432074a69013a2b6f6841ccb8595823fbf65e9bd61a63a45efd12dd9017d220521ab036a8b747b96498e4bd8cbd AUX zig-0.9.1-fix-riscv.patch 1853 BLAKE2B 0d0c9e1d639ed1a5228ad7db3182f848d9f6deba0e8e091d993256b90fdf152def7f80446ba19aeee0bd4c6d6a87dfcba5df311a54ede2b79510b6552cb2da9c SHA512 5c85a7fed80b5d157c99f80cf9971cdd91c93477de49ad01d163956ebc17d267d6a0002212fe16f5ca04b35c96e5f4721d1be44c6f4955429940763d924cc92f AUX zig-0.9.1-fix-single-threaded.patch 390 BLAKE2B 443a5ab709aa90ed92636310c204a15cbb60a997ff39f7f7102fdd4f21f66e64bd79516653729ecbd719aeb39809457c3db2d1c3c9d0614d1fb637307cc2a892 SHA512 f4e6f87a3aae5380c3f3e1eda85f10914119a378dd08c8375d18dd038dc0b131234a62fd86f46f64cd2038e5abd787e4a7876929fceac85b01bd6e4bce3b3263 DIST zig-0.9.1-fix-detecting-abi.patch 22233 BLAKE2B fa523c4c4c23a74c0b4f85c6d2d91ef98b31d25694bb9dbc7988b82db972a16ab273aa9f1883cfa8ca79ef7fc56fca67d0a8656ba248b6db47bc902b7ac64a93 SHA512 259967f88f54c20f556bd9d67189ce3a2cfeb0250f0cee4dffb29020d976d61265a5dd9ae9cfcadfb7b1e152b47ee17f4184eafac2b80495f4ee8f98733cd692 DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d -EBUILD zig-0.9.1-r2.ebuild 1515 BLAKE2B b81ff76e294b7170d4ddc23934aed75b5f7e9e3c579c9bf9863a0de79626c61bb3611227cd50e621dccd752579105f4de78ea249112c134a2fdc3a01b2765161 SHA512 1964de58fdcb2bf4c604e91fe51742ae54cfb61e70a944405738d40ce6f56c2eb7e6dcde96685ed20f4872fac8c0f13420eac17a775b91ac798fa58943385a15 +EBUILD zig-0.9.1-r3.ebuild 1611 BLAKE2B 1fb2ad3330aa85dfb54c4a41897fa000bf07712dd6db257598a182d814e996cb74b22b8fa615f2f97a600fb820b16f9158743c974670628f1f4e1091ab02620b SHA512 8469f133c8e32b9796e6076314ffbfb73fc19fd10c23139cc6aa228b08293976321588d96ba698eb8530dce36ce77549c22ffc1fd43256e2cae53b86823c58ac EBUILD zig-9999.ebuild 1712 BLAKE2B f3c06947f297f10a1bfa48f8a6a4d57e090b3c913ad88edefbdbf3af20ae8853e9b0e3a37f8a1247f0a17d0d807f703229575eb6b3b57df7b1b2d6f528e525ae SHA512 ff5c1eef9c6a7e55b851e4f65d97cdf35fe9f654a29ee481ded41eb80b202cd8d235543d6050fa781a4ca8adb7d59ebe68caf0cc9cc25a774250aba88d41d0d8 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083 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-r2.ebuild deleted file mode 100644 index 4adbe994a8f3..000000000000 --- a/dev-lang/zig/zig-0.9.1-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=13 -inherit cmake llvm check-reqs - -DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ziglang/zig.git" - inherit git-r3 -else - SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -SRC_URI+=" https://codeberg.org/BratishkaErik/distfiles/media/branch/master/zig-0.9.1-fix-detecting-abi.patch" -LICENSE="MIT" -SLOT="0" -IUSE="test +threads" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${P}-fix-single-threaded.patch" - "${FILESDIR}/${P}-fix-riscv.patch" - "${FILESDIR}/${P}-fix-bad-hostname-segfault.patch" - "${DISTDIR}/zig-0.9.1-fix-detecting-abi.patch" -) - -BUILD_DIR="${S}/build" - -DEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT}= - sys-devel/lld:${LLVM_MAX_SLOT}= - sys-devel/llvm:${LLVM_MAX_SLOT}= - >=sys-libs/zlib-1.2.12 -" - -RDEPEND="${DEPEND} - !dev-lang/zig-bin -" - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements -CHECKREQS_MEMORY="10G" - -pkg_setup() { - llvm_pkg_setup - check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_PREFER_CLANG_CPP_DYLIB=ON - -DZIG_SINGLE_THREADED="$(usex !threads)" - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./zig build test || die -} diff --git a/dev-lang/zig/zig-0.9.1-r3.ebuild b/dev-lang/zig/zig-0.9.1-r3.ebuild new file mode 100644 index 000000000000..463cead06e2d --- /dev/null +++ b/dev-lang/zig/zig-0.9.1-r3.ebuild @@ -0,0 +1,72 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=13 +inherit cmake llvm check-reqs + +DESCRIPTION="A robust, optimal, and maintainable programming language" +HOMEPAGE="https://ziglang.org/" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/ziglang/zig.git" + inherit git-r3 +else + SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64" +fi + +SRC_URI+=" https://codeberg.org/BratishkaErik/distfiles/media/branch/master/zig-0.9.1-fix-detecting-abi.patch" +LICENSE="MIT" +SLOT="0" +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" + "${DISTDIR}/zig-0.9.1-fix-detecting-abi.patch" +) + +BUILD_DIR="${S}/build" + +DEPEND=" + sys-devel/clang:${LLVM_MAX_SLOT}= + sys-devel/lld:${LLVM_MAX_SLOT}= + sys-devel/llvm:${LLVM_MAX_SLOT}= + >=sys-libs/zlib-1.2.12 +" + +RDEPEND="${DEPEND} + !dev-lang/zig-bin +" + +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements +CHECKREQS_MEMORY="10G" + +pkg_setup() { + llvm_pkg_setup + check-reqs_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -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 +} + +src_test() { + cd "${BUILD_DIR}" || die + ./zig build test || die +} -- cgit v1.2.3