diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-01-01 20:00:27 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-01-03 16:55:01 +0100 |
| commit | 72f4dff5d8ce757144b88e7a9c599c36c724c904 (patch) | |
| tree | 7641236b1895c4be5e867c092a605cce8b7426d8 | |
| parent | qt5-build.eclass: fix typo (diff) | |
| download | qt-72f4dff5d8ce757144b88e7a9c599c36c724c904.tar.gz qt-72f4dff5d8ce757144b88e7a9c599c36c724c904.tar.bz2 qt-72f4dff5d8ce757144b88e7a9c599c36c724c904.zip | |
qt5-build.eclass: Move append-ldflags and filter-lto to src_prepare
Bug: https://bugs.gentoo.org/919789
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/qt5-build.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 9561d918..60d525b3 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -179,6 +179,15 @@ fi qt5-build_src_prepare() { qt5_prepare_env + # Workaround for bug #915203 + # Upstream: https://bugreports.qt.io/browse/QTBUG-111514 + if [[ ${PN} != qtcore ]]; then + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + fi + + # many bugs, no one to fix (already done for qtbase) + filter-lto + if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then if [[ -n ${KDE_ORG_COMMIT} ]]; then einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" @@ -231,15 +240,6 @@ qt5-build_src_configure() { qt5_tools_configure fi - # Workaround for bug #915203 - # Upstream: https://bugreports.qt.io/browse/QTBUG-111514 - if [[ ${PN} != qtcore ]]; then - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - fi - - # many bugs, no one to fix - filter-lto - qt5_foreach_target_subdir qt5_qmake } |