From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1441055-garchives=archives.gentoo.org@lists.gentoo.org>
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 12361158094
for <garchives@archives.gentoo.org>; Fri, 30 Sep 2022 18:27:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3E8C0E0C57;
Fri, 30 Sep 2022 18:27:40 +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 27978E0C57
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Sep 2022 18:27:40 +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 2C15D340E01
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Sep 2022 18:27:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 48A1AD4
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Sep 2022 18:27:37 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1664562453.23d0a39186610053fa16320267217ec37d538a65.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: 23d0a39186610053fa16320267217ec37d538a65
X-VCS-Branch: master
Date: Fri, 30 Sep 2022 18:27:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 27360122-bf9e-418d-993f-be4300781a71
X-Archives-Hash: 3c4276b1b0d45b17de99a8401b413b71
commit: 23d0a39186610053fa16320267217ec37d538a65
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 18:26:06 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 18:27:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d0a391
sys-devel/lld: Revert "Add zstd support to 16.x"
Reverts: 861536e5487b9c63f9cf878b4f2ecc3e8a220daf
Signed-off-by: Michał Górny <mgorny <AT> 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, 6 insertions(+), 26 deletions(-)
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index c683b72095e6..f8773e9ca849 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 multilib python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/"
@@ -12,12 +12,11 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
KEYWORDS=""
-IUSE="debug test zstd"
+IUSE="debug test"
RESTRICT="!test? ( test )"
DEPEND="
- ~sys-devel/llvm-${PV}[zstd=]
- zstd? ( app-arch/zstd:= )
+ ~sys-devel/llvm-${PV}
"
RDEPEND="
${DEPEND}
@@ -62,19 +61,10 @@ 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 c683b72095e6..f8773e9ca849 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 multilib python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/"
@@ -12,12 +12,11 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
KEYWORDS=""
-IUSE="debug test zstd"
+IUSE="debug test"
RESTRICT="!test? ( test )"
DEPEND="
- ~sys-devel/llvm-${PV}[zstd=]
- zstd? ( app-arch/zstd:= )
+ ~sys-devel/llvm-${PV}
"
RDEPEND="
${DEPEND}
@@ -62,19 +61,10 @@ 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