diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-01-10 13:02:42 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-10 13:02:42 +0000 |
| commit | 8c8f1cfd2aa9e839aad7dad6fd43b370cfbc0a1e (patch) | |
| tree | f7b0f94c13a0454ed75b614028f1455e894f28d2 /eclass | |
| parent | 47f05d092ef8c19b3e973f62648e58c0e1a18631 (diff) | |
gentoo auto-resync : 10:01:2024 - 13:02:42
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38912 -> 38921 bytes | |||
| -rw-r--r-- | eclass/cmake.eclass | 4 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 18 |
3 files changed, 12 insertions, 10 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 2ec66b5c5ebd..837551c99298 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 10749e9a2f31..ef5e6dd678a1 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -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 # @ECLASS: cmake.eclass @@ -541,6 +541,8 @@ cmake_src_configure() { set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") set(BUILD_SHARED_LIBS ON CACHE BOOL "") set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "") + set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "") + set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "") _EOF_ if [[ -n ${_ECM_ECLASS} ]]; then diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0e416e253cc2..76a089b2908d 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 + 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 } |