summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-10-13 18:18:15 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-10-13 18:18:15 +0100
commitb8330d80ce605a72596ccfa1bfc087b9ded559b8 (patch)
tree209587b26d39505ff0a0c21c2f20ef51652688e9 /eclass
parent41c2683a5cfac2bd3280dc5d5aaed73b6c377bcf (diff)
gentoo auto-resync : 13:10:2023 - 18:18:15
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin39141 -> 39146 bytes
-rw-r--r--eclass/llvm.org.eclass3
-rw-r--r--eclass/qt6-build.eclass4
3 files changed, 5 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b0c2bcd3428c..73481012ffda 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index a43cef51ef81..9bffc118f265 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -72,6 +72,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
_LLVM_SOURCE_TYPE=snapshot
case ${PV} in
+ 18.0.0_pre20231013)
+ EGIT_COMMIT=5d35273a32d239b7407338e13ed71b59174d6536
+ ;;
18.0.0_pre20231002)
EGIT_COMMIT=39fec5457c0925bd39f67f63fe17391584e08258
;;
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 35a710b86545..6f002bc799ad 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -257,8 +257,8 @@ _qt6-build_match_cpu_flags() {
[[ ${intrin} ]] && flags+=( -mno-${intrin} )
done
done < <(
- # TODO: drop ver_test and ${fma} when <6.5.3 is gone
- ver_test ${PV} -ge 6.5.3 && fma= || fma=fma
+ # TODO: drop ver_test and ${fma} when <6.5.3 and 6.6.0 are gone
+ ver_test ${PV} -ge 6.5.3 && ver_test ${PV} -ne 6.6.0 && fma= || fma=fma
$(tc-getCXX) -E -P ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 2
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
#include <x86intrin.h>