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 C5673158094 for ; Fri, 30 Sep 2022 15:52:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D68DE0BBE; Fri, 30 Sep 2022 15:52:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8298E0BBE for ; Fri, 30 Sep 2022 15:52:57 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B870340FAD for ; Fri, 30 Sep 2022 15:52:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B563B5EC for ; Fri, 30 Sep 2022 15:52:54 +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: <1664553171.861536e5487b9c63f9cf878b4f2ecc3e8a220daf.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/lld/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/lld/lld-16.0.0.9999.ebuild sys-devel/lld/lld-16.0.0_pre20220930.ebuild X-VCS-Directories: sys-devel/lld/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 861536e5487b9c63f9cf878b4f2ecc3e8a220daf X-VCS-Branch: master Date: Fri, 30 Sep 2022 15:52:54 +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: 1fdbb53f-d4aa-49e5-bb49-dff9ba33c868 X-Archives-Hash: cf2ad986e1a404239141c1834951cfbd commit: 861536e5487b9c63f9cf878b4f2ecc3e8a220daf Author: Michał Górny gentoo org> AuthorDate: Fri Sep 30 15:49:24 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Sep 30 15:52:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=861536e5 sys-devel/lld: Add zstd support to 16.x Bug: https://bugs.gentoo.org/873526 Signed-off-by: Michał Górny gentoo.org> sys-devel/lld/lld-16.0.0.9999.ebuild | 16 +++++++++++++--- sys-devel/lld/lld-16.0.0_pre20220930.ebuild | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild index f8773e9ca849..c683b72095e6 100644 --- a/sys-devel/lld/lld-16.0.0.9999.ebuild +++ b/sys-devel/lld/lld-16.0.0.9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 +inherit cmake flag-o-matic llvm llvm.org multilib python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" @@ -12,11 +12,12 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" KEYWORDS="" -IUSE="debug test" +IUSE="debug test zstd" RESTRICT="!test? ( test )" DEPEND=" - ~sys-devel/llvm-${PV} + ~sys-devel/llvm-${PV}[zstd=] + zstd? ( app-arch/zstd:= ) " RDEPEND=" ${DEPEND} @@ -61,10 +62,19 @@ src_configure() { use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + if use zstd; then + cat > "${T}"/zstdConfig.cmake <<-EOF || die + add_library(zstd::libzstd_shared SHARED IMPORTED) + set_target_properties(zstd::libzstd_shared PROPERTIES + IMPORTED_LOCATION "${EPREFIX}/usr/$(get_libdir)/libzstd$(get_libname)") + EOF + fi + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DLLVM_INCLUDE_TESTS=$(usex test) -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -Dzstd_DIR="${T}" ) use test && mycmakeargs+=( -DLLVM_BUILD_TESTS=ON diff --git a/sys-devel/lld/lld-16.0.0_pre20220930.ebuild b/sys-devel/lld/lld-16.0.0_pre20220930.ebuild index f8773e9ca849..c683b72095e6 100644 --- a/sys-devel/lld/lld-16.0.0_pre20220930.ebuild +++ b/sys-devel/lld/lld-16.0.0_pre20220930.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 +inherit cmake flag-o-matic llvm llvm.org multilib python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" @@ -12,11 +12,12 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" KEYWORDS="" -IUSE="debug test" +IUSE="debug test zstd" RESTRICT="!test? ( test )" DEPEND=" - ~sys-devel/llvm-${PV} + ~sys-devel/llvm-${PV}[zstd=] + zstd? ( app-arch/zstd:= ) " RDEPEND=" ${DEPEND} @@ -61,10 +62,19 @@ src_configure() { use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + if use zstd; then + cat > "${T}"/zstdConfig.cmake <<-EOF || die + add_library(zstd::libzstd_shared SHARED IMPORTED) + set_target_properties(zstd::libzstd_shared PROPERTIES + IMPORTED_LOCATION "${EPREFIX}/usr/$(get_libdir)/libzstd$(get_libname)") + EOF + fi + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DLLVM_INCLUDE_TESTS=$(usex test) -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -Dzstd_DIR="${T}" ) use test && mycmakeargs+=( -DLLVM_BUILD_TESTS=ON