| 1 |
commit: 23d0a39186610053fa16320267217ec37d538a65 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 30 18:26:06 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 18:27:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d0a391 |
| 7 |
|
| 8 |
sys-devel/lld: Revert "Add zstd support to 16.x" |
| 9 |
|
| 10 |
Reverts: 861536e5487b9c63f9cf878b4f2ecc3e8a220daf |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-devel/lld/lld-16.0.0.9999.ebuild | 16 +++------------- |
| 14 |
sys-devel/lld/lld-16.0.0_pre20220930.ebuild | 16 +++------------- |
| 15 |
2 files changed, 6 insertions(+), 26 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild |
| 18 |
index c683b72095e6..f8773e9ca849 100644 |
| 19 |
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild |
| 20 |
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild |
| 21 |
@@ -4,7 +4,7 @@ |
| 22 |
EAPI=8 |
| 23 |
|
| 24 |
PYTHON_COMPAT=( python3_{8..11} ) |
| 25 |
-inherit cmake flag-o-matic llvm llvm.org multilib python-any-r1 |
| 26 |
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 |
| 27 |
|
| 28 |
DESCRIPTION="The LLVM linker (link editor)" |
| 29 |
HOMEPAGE="https://llvm.org/" |
| 30 |
@@ -12,12 +12,11 @@ HOMEPAGE="https://llvm.org/" |
| 31 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 32 |
SLOT="0" |
| 33 |
KEYWORDS="" |
| 34 |
-IUSE="debug test zstd" |
| 35 |
+IUSE="debug test" |
| 36 |
RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
DEPEND=" |
| 39 |
- ~sys-devel/llvm-${PV}[zstd=] |
| 40 |
- zstd? ( app-arch/zstd:= ) |
| 41 |
+ ~sys-devel/llvm-${PV} |
| 42 |
" |
| 43 |
RDEPEND=" |
| 44 |
${DEPEND} |
| 45 |
@@ -62,19 +61,10 @@ src_configure() { |
| 46 |
|
| 47 |
use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
| 48 |
|
| 49 |
- if use zstd; then |
| 50 |
- cat > "${T}"/zstdConfig.cmake <<-EOF || die |
| 51 |
- add_library(zstd::libzstd_shared SHARED IMPORTED) |
| 52 |
- set_target_properties(zstd::libzstd_shared PROPERTIES |
| 53 |
- IMPORTED_LOCATION "${EPREFIX}/usr/$(get_libdir)/libzstd$(get_libname)") |
| 54 |
- EOF |
| 55 |
- fi |
| 56 |
- |
| 57 |
local mycmakeargs=( |
| 58 |
-DBUILD_SHARED_LIBS=ON |
| 59 |
-DLLVM_INCLUDE_TESTS=$(usex test) |
| 60 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 61 |
- -Dzstd_DIR="${T}" |
| 62 |
) |
| 63 |
use test && mycmakeargs+=( |
| 64 |
-DLLVM_BUILD_TESTS=ON |
| 65 |
|
| 66 |
diff --git a/sys-devel/lld/lld-16.0.0_pre20220930.ebuild b/sys-devel/lld/lld-16.0.0_pre20220930.ebuild |
| 67 |
index c683b72095e6..f8773e9ca849 100644 |
| 68 |
--- a/sys-devel/lld/lld-16.0.0_pre20220930.ebuild |
| 69 |
+++ b/sys-devel/lld/lld-16.0.0_pre20220930.ebuild |
| 70 |
@@ -4,7 +4,7 @@ |
| 71 |
EAPI=8 |
| 72 |
|
| 73 |
PYTHON_COMPAT=( python3_{8..11} ) |
| 74 |
-inherit cmake flag-o-matic llvm llvm.org multilib python-any-r1 |
| 75 |
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 |
| 76 |
|
| 77 |
DESCRIPTION="The LLVM linker (link editor)" |
| 78 |
HOMEPAGE="https://llvm.org/" |
| 79 |
@@ -12,12 +12,11 @@ HOMEPAGE="https://llvm.org/" |
| 80 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 81 |
SLOT="0" |
| 82 |
KEYWORDS="" |
| 83 |
-IUSE="debug test zstd" |
| 84 |
+IUSE="debug test" |
| 85 |
RESTRICT="!test? ( test )" |
| 86 |
|
| 87 |
DEPEND=" |
| 88 |
- ~sys-devel/llvm-${PV}[zstd=] |
| 89 |
- zstd? ( app-arch/zstd:= ) |
| 90 |
+ ~sys-devel/llvm-${PV} |
| 91 |
" |
| 92 |
RDEPEND=" |
| 93 |
${DEPEND} |
| 94 |
@@ -62,19 +61,10 @@ src_configure() { |
| 95 |
|
| 96 |
use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
| 97 |
|
| 98 |
- if use zstd; then |
| 99 |
- cat > "${T}"/zstdConfig.cmake <<-EOF || die |
| 100 |
- add_library(zstd::libzstd_shared SHARED IMPORTED) |
| 101 |
- set_target_properties(zstd::libzstd_shared PROPERTIES |
| 102 |
- IMPORTED_LOCATION "${EPREFIX}/usr/$(get_libdir)/libzstd$(get_libname)") |
| 103 |
- EOF |
| 104 |
- fi |
| 105 |
- |
| 106 |
local mycmakeargs=( |
| 107 |
-DBUILD_SHARED_LIBS=ON |
| 108 |
-DLLVM_INCLUDE_TESTS=$(usex test) |
| 109 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 110 |
- -Dzstd_DIR="${T}" |
| 111 |
) |
| 112 |
use test && mycmakeargs+=( |
| 113 |
-DLLVM_BUILD_TESTS=ON |
Archives