commit: c060d95c3f33f1033c003575096609e0795a2951
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 07:39:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 07:51:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c060d95c
sys-devel/llvm: fixup zlib, zstd handling
>From the LLVM docs:
```
LLVM_ENABLE_ZLIB:STRING
Used to decide if LLVM tools should support compression/decompression with
zlib. Allowed values are OFF, ON (default, enable if zlib is found), and
FORCE_ON (error if zlib is not found).
LLVM_ENABLE_ZSTD:STRING
Used to decide if LLVM tools should support compression/decompression with
zstd. Allowed values are OFF, ON (default, enable if zstd is found), and
FORCE_ON (error if zstd is not found).
```
We had a user report that they had an LLVM / LLD built without zlib support
despite the unconditional RDEPEND we have. Use FORCE_ON so we bail out at
configure/build time rather than silently buliding without it if the system's
zlib is broken.
Ditto zstd.
Bug: https://bugs.gentoo.org/873526
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/llvm/llvm-15.0.7-r3.ebuild | 5 +++--
sys-devel/llvm/llvm-16.0.6.ebuild | 5 +++--
sys-devel/llvm/llvm-17.0.6.ebuild | 5 +++--
sys-devel/llvm/llvm-18.0.0.9999.ebuild | 5 +++--
sys-devel/llvm/llvm-18.0.0_pre20231215.ebuild | 5 +++--
sys-devel/llvm/llvm-18.0.0_pre20231222.ebuild | 5 +++--
sys-devel/llvm/llvm-18.0.0_pre20231228.ebuild | 5 +++--
7 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/sys-devel/llvm/llvm-15.0.7-r3.ebuild
b/sys-devel/llvm/llvm-15.0.7-r3.ebuild
index 97b7d626ec67..12ebc8511b10 100644
--- a/sys-devel/llvm/llvm-15.0.7-r3.ebuild
+++ b/sys-devel/llvm/llvm-15.0.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -356,7 +356,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_HOST_TRIPLE="${CHOST}"
diff --git a/sys-devel/llvm/llvm-16.0.6.ebuild
b/sys-devel/llvm/llvm-16.0.6.ebuild
index d6cb84f6df61..d44abd3b30bf 100644
--- a/sys-devel/llvm/llvm-16.0.6.ebuild
+++ b/sys-devel/llvm/llvm-16.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -364,7 +364,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_HOST_TRIPLE="${CHOST}"
diff --git a/sys-devel/llvm/llvm-17.0.6.ebuild
b/sys-devel/llvm/llvm-17.0.6.ebuild
index 8c476ecc2bc9..9d9cc96939a3 100644
--- a/sys-devel/llvm/llvm-17.0.6.ebuild
+++ b/sys-devel/llvm/llvm-17.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -377,7 +377,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_ENABLE_CURL=$(usex debuginfod)
-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
diff --git a/sys-devel/llvm/llvm-18.0.0.9999.ebuild
b/sys-devel/llvm/llvm-18.0.0.9999.ebuild
index 0fe2c5be8d56..c6874626a4e4 100644
--- a/sys-devel/llvm/llvm-18.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -373,7 +373,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_ENABLE_CURL=$(usex debuginfod)
-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
diff --git a/sys-devel/llvm/llvm-18.0.0_pre20231215.ebuild
b/sys-devel/llvm/llvm-18.0.0_pre20231215.ebuild
index 0fe2c5be8d56..c6874626a4e4 100644
--- a/sys-devel/llvm/llvm-18.0.0_pre20231215.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0_pre20231215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -373,7 +373,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_ENABLE_CURL=$(usex debuginfod)
-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
diff --git a/sys-devel/llvm/llvm-18.0.0_pre20231222.ebuild
b/sys-devel/llvm/llvm-18.0.0_pre20231222.ebuild
index 0fe2c5be8d56..c6874626a4e4 100644
--- a/sys-devel/llvm/llvm-18.0.0_pre20231222.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0_pre20231222.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -373,7 +373,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_ENABLE_CURL=$(usex debuginfod)
-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
diff --git a/sys-devel/llvm/llvm-18.0.0_pre20231228.ebuild
b/sys-devel/llvm/llvm-18.0.0_pre20231228.ebuild
index 0fe2c5be8d56..c6874626a4e4 100644
--- a/sys-devel/llvm/llvm-18.0.0_pre20231228.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0_pre20231228.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -373,7 +373,8 @@ multilib_src_configure() {
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
- -DLLVM_ENABLE_ZSTD=$(usex zstd)
+ -DLLVM_ENABLE_ZLIB=FORCE_ON
+ -DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-DLLVM_ENABLE_CURL=$(usex debuginfod)
-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
