| 1 |
commit: 693e3888cd94ce96cd2e5f63242d751d12aa2f1f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 30 18:26:25 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 18:27:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693e3888 |
| 7 |
|
| 8 |
sys-devel/llvm: Revert "Add zstd support in 16.x" |
| 9 |
|
| 10 |
Unfortunately, LLVM's cmake files leak the dependency on otherwise |
| 11 |
non-existing zstd targets, so everything building against LLVM fails |
| 12 |
now. |
| 13 |
|
| 14 |
Reverts: 70bf3a8996b9a14b0e28d7e367275a20f6d0cffc |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-devel/llvm/llvm-16.0.0.9999.ebuild | 22 +++------------------- |
| 18 |
sys-devel/llvm/llvm-16.0.0_pre20220930.ebuild | 22 +++------------------- |
| 19 |
2 files changed, 6 insertions(+), 38 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild |
| 22 |
index d0153e31a64d..9171387473ba 100644 |
| 23 |
--- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild |
| 24 |
+++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild |
| 25 |
@@ -4,8 +4,8 @@ |
| 26 |
EAPI=8 |
| 27 |
|
| 28 |
PYTHON_COMPAT=( python3_{8..11} ) |
| 29 |
-inherit cmake llvm.org multilib multilib-minimal pax-utils \ |
| 30 |
- python-any-r1 toolchain-funcs |
| 31 |
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ |
| 32 |
+ toolchain-funcs |
| 33 |
|
| 34 |
DESCRIPTION="Low Level Virtual Machine" |
| 35 |
HOMEPAGE="https://llvm.org/" |
| 36 |
@@ -19,10 +19,7 @@ HOMEPAGE="https://llvm.org/" |
| 37 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" |
| 38 |
SLOT="$(ver_cut 1)" |
| 39 |
KEYWORDS="" |
| 40 |
-IUSE=" |
| 41 |
- +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar |
| 42 |
- xml z3 zstd |
| 43 |
-" |
| 44 |
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3" |
| 45 |
RESTRICT="!test? ( test )" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
@@ -35,7 +32,6 @@ RDEPEND=" |
| 49 |
xar? ( app-arch/xar ) |
| 50 |
xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) |
| 51 |
z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] ) |
| 52 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) |
| 53 |
" |
| 54 |
DEPEND=" |
| 55 |
${RDEPEND} |
| 56 |
@@ -341,13 +337,6 @@ multilib_src_configure() { |
| 57 |
ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 58 |
ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 59 |
fi |
| 60 |
- if use zstd; then |
| 61 |
- cat > "${BUILD_DIR}"/zstdConfig.cmake <<-EOF || die |
| 62 |
- add_library(zstd::libzstd_shared SHARED IMPORTED) |
| 63 |
- set_target_properties(zstd::libzstd_shared PROPERTIES |
| 64 |
- IMPORTED_LOCATION "${EPREFIX}/usr/$(get_libdir)/libzstd$(get_libname)") |
| 65 |
- EOF |
| 66 |
- fi |
| 67 |
|
| 68 |
local libdir=$(get_libdir) |
| 69 |
local mycmakeargs=( |
| 70 |
@@ -377,7 +366,6 @@ multilib_src_configure() { |
| 71 |
-DLLVM_ENABLE_EH=ON |
| 72 |
-DLLVM_ENABLE_RTTI=ON |
| 73 |
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3) |
| 74 |
- -DLLVM_ENABLE_ZSTD=$(usex zstd) |
| 75 |
|
| 76 |
-DLLVM_HOST_TRIPLE="${CHOST}" |
| 77 |
|
| 78 |
@@ -386,10 +374,6 @@ multilib_src_configure() { |
| 79 |
# used only for llvm-objdump tool |
| 80 |
-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0) |
| 81 |
|
| 82 |
- # workaround llvm requiring cmake files from zstd |
| 83 |
- -Dzstd_DIR="${BUILD_DIR}" |
| 84 |
- -DLLVM_PREFER_STATIC_ZSTD=FALSE |
| 85 |
- |
| 86 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 87 |
|
| 88 |
# disable OCaml bindings (now in dev-ml/llvm-ocaml) |
| 89 |
|
| 90 |
diff --git a/sys-devel/llvm/llvm-16.0.0_pre20220930.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20220930.ebuild |
| 91 |
index d0153e31a64d..9171387473ba 100644 |
| 92 |
--- a/sys-devel/llvm/llvm-16.0.0_pre20220930.ebuild |
| 93 |
+++ b/sys-devel/llvm/llvm-16.0.0_pre20220930.ebuild |
| 94 |
@@ -4,8 +4,8 @@ |
| 95 |
EAPI=8 |
| 96 |
|
| 97 |
PYTHON_COMPAT=( python3_{8..11} ) |
| 98 |
-inherit cmake llvm.org multilib multilib-minimal pax-utils \ |
| 99 |
- python-any-r1 toolchain-funcs |
| 100 |
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ |
| 101 |
+ toolchain-funcs |
| 102 |
|
| 103 |
DESCRIPTION="Low Level Virtual Machine" |
| 104 |
HOMEPAGE="https://llvm.org/" |
| 105 |
@@ -19,10 +19,7 @@ HOMEPAGE="https://llvm.org/" |
| 106 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" |
| 107 |
SLOT="$(ver_cut 1)" |
| 108 |
KEYWORDS="" |
| 109 |
-IUSE=" |
| 110 |
- +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar |
| 111 |
- xml z3 zstd |
| 112 |
-" |
| 113 |
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3" |
| 114 |
RESTRICT="!test? ( test )" |
| 115 |
|
| 116 |
RDEPEND=" |
| 117 |
@@ -35,7 +32,6 @@ RDEPEND=" |
| 118 |
xar? ( app-arch/xar ) |
| 119 |
xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) |
| 120 |
z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] ) |
| 121 |
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) |
| 122 |
" |
| 123 |
DEPEND=" |
| 124 |
${RDEPEND} |
| 125 |
@@ -341,13 +337,6 @@ multilib_src_configure() { |
| 126 |
ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 127 |
ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 128 |
fi |
| 129 |
- if use zstd; then |
| 130 |
- cat > "${BUILD_DIR}"/zstdConfig.cmake <<-EOF || die |
| 131 |
- add_library(zstd::libzstd_shared SHARED IMPORTED) |
| 132 |
- set_target_properties(zstd::libzstd_shared PROPERTIES |
| 133 |
- IMPORTED_LOCATION "${EPREFIX}/usr/$(get_libdir)/libzstd$(get_libname)") |
| 134 |
- EOF |
| 135 |
- fi |
| 136 |
|
| 137 |
local libdir=$(get_libdir) |
| 138 |
local mycmakeargs=( |
| 139 |
@@ -377,7 +366,6 @@ multilib_src_configure() { |
| 140 |
-DLLVM_ENABLE_EH=ON |
| 141 |
-DLLVM_ENABLE_RTTI=ON |
| 142 |
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3) |
| 143 |
- -DLLVM_ENABLE_ZSTD=$(usex zstd) |
| 144 |
|
| 145 |
-DLLVM_HOST_TRIPLE="${CHOST}" |
| 146 |
|
| 147 |
@@ -386,10 +374,6 @@ multilib_src_configure() { |
| 148 |
# used only for llvm-objdump tool |
| 149 |
-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0) |
| 150 |
|
| 151 |
- # workaround llvm requiring cmake files from zstd |
| 152 |
- -Dzstd_DIR="${BUILD_DIR}" |
| 153 |
- -DLLVM_PREFER_STATIC_ZSTD=FALSE |
| 154 |
- |
| 155 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 156 |
|
| 157 |
# disable OCaml bindings (now in dev-ml/llvm-ocaml) |
Archives