diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38929 -> 38933 bytes | |||
| -rw-r--r-- | eclass/qt5-build.eclass | 4 | ||||
| -rw-r--r-- | eclass/qt6-build.eclass | 16 |
3 files changed, 3 insertions, 17 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex e427dea174f8..ab93c64c4ec4 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0cb64f3010ea..0e416e253cc2 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -233,8 +233,8 @@ qt5-build_src_configure() { # Workaround for bug #915203 # Upstream: https://bugreports.qt.io/browse/QTBUG-111514 - if [[ ${PN} != qtcore ]] && tc-ld-is-lld ; then - append-ldflags -Wl,--undefined-version + if [[ ${PN} != qtcore ]] ; then + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) fi # many bugs, no one to fix diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 0e439e946af3..561a4fe20422 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qt6-build.eclass @@ -196,20 +196,6 @@ qt_feature() { echo "-DQT_FEATURE_${2:-${1}}=$(usex ${1} ON OFF)" } -# @FUNCTION: qt6_symlink_binary_to_path -# @USAGE: <target binary name> [suffix] -# @DESCRIPTION: -# Symlink a given binary from QT6_BINDIR to QT6_PREFIX/bin, with -# optional suffix. -# -# Note: deprecated, will be removed when no consumers left in-tree, -# see internal the _qt6-build_create_user_facing_links -qt6_symlink_binary_to_path() { - [[ ${#} -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" - - dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2} -} - ###### Internal functions ###### # @FUNCTION: _qt6-build_create_user_facing_links |