summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin39908 -> 39903 bytes
-rw-r--r--eclass/autotools.eclass8
-rw-r--r--eclass/distutils-r1.eclass2
-rw-r--r--eclass/llvm.org.eclass9
-rw-r--r--eclass/qt6-build.eclass9
5 files changed, 18 insertions, 10 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 1bf40db86988..759eb218bafe 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 0571b18ba525..641612f37193 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -312,7 +312,13 @@ eautoreconf() {
else
eautoconf --force
fi
- [[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader
+ if [[ ${AT_NOEAUTOHEADER} != "yes" ]] ; then
+ if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then
+ eautoheader
+ else
+ eautoheader --force
+ fi
+ fi
[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 5a6ebdcede8a..53b40163c216 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1339,9 +1339,9 @@ distutils_pep517_install() {
ninjaopts = shlex.split(os.environ["NINJAOPTS"])
print(json.dumps({
"build.tool-args": ninjaopts,
+ "build.verbose": True,
"cmake.args": ";".join(sys.argv[1:]),
"cmake.build-type": "${CMAKE_BUILD_TYPE}",
- "cmake.verbose": True,
"install.strip": False,
}))
EOF
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 3050fd1e471e..2338c3f2cc53 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -72,15 +72,12 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
_LLVM_SOURCE_TYPE=snapshot
case ${PV} in
+ 20.0.0_pre20240924)
+ EGIT_COMMIT=cde7b30268a85a3e7900a31534a97e7eb4de9236
+ ;;
20.0.0_pre20240917)
EGIT_COMMIT=41f1b467a29d2ca4e35df37c3aa79a0a8c04bc4f
;;
- 20.0.0_pre20240910)
- EGIT_COMMIT=bece0d7517bd0a036dc8a319514e4a8a5c497dee
- ;;
- 20.0.0_pre20240830)
- EGIT_COMMIT=5500e21942f7047344b6fee62d3e08c0ba2f9182
- ;;
*)
die "Unknown snapshot: ${PV}"
;;
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 3cd8b606c235..c6b8db578f46 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -59,17 +59,22 @@ if [[ ${PV} == *.9999 ]]; then
else
QT6_BUILD_TYPE=release
_QT6_SRC=official
+ _QT6_SUBDIR=
if [[ ${PV} == *_@(alpha|beta|rc)* ]]; then
QT6_BUILD_TYPE=pre-release
_QT6_SRC=development
+
+ # TODO?: drop _QT6_SUBDIR if no longer used for 6.9, unknown
+ # if this was a one-time mistake or a permanent change
+ ver_test ${PV} -ge 6.8 && _QT6_SUBDIR=src/
fi
_QT6_P=${QT6_MODULE}-everywhere-src-${PV/_/-}
- SRC_URI="https://download.qt.io/${_QT6_SRC}_releases/qt/${PV%.*}/${PV/_/-}/submodules/${_QT6_P}.tar.xz"
+ SRC_URI="https://download.qt.io/${_QT6_SRC}_releases/qt/${PV%.*}/${PV/_/-}/${_QT6_SUBDIR}submodules/${_QT6_P}.tar.xz"
S=${WORKDIR}/${_QT6_P}
- unset _QT6_P _QT6_SRC
+ unset _QT6_P _QT6_SRC _QT6_SUBDIR
fi
readonly QT6_BUILD_TYPE