diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 40347 -> 40347 bytes | |||
| -rw-r--r-- | eclass/qt6-build.eclass | 9 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 8d5b2f025959..943eb8bb661c 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 1c13174804ad..bafaf4ba9c56 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -60,22 +60,17 @@ 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/_/-}/${_QT6_SUBDIR}submodules/${_QT6_P}.tar.xz" + SRC_URI="https://download.qt.io/${_QT6_SRC}_releases/qt/${PV%.*}/${PV/_/-}/submodules/${_QT6_P}.tar.xz" S=${WORKDIR}/${_QT6_P} - unset _QT6_P _QT6_SRC _QT6_SUBDIR + unset _QT6_P _QT6_SRC fi readonly QT6_BUILD_TYPE diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d48d8cf78d06..bb8bb6512394 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2647,7 +2647,7 @@ toolchain_src_install() { fi # Hack for C++ modules - if ! is_crosscompile; then + if ! is_crosscompile && tc_version_is_at_least 15.0.1_pre20250316 ${PV}; then # PR19266 (bug #948394) sed -i -e "s,\.\./lib/gcc/${CHOST}/${GCCMAJOR}/include/,include/," \ "${ED}"/usr/lib/gcc/${CHOST}/${GCCMAJOR}/libstdc++.modules.json || die |