diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-23 20:48:53 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-23 20:48:53 +0000 |
| commit | 51536d2fe4697ba9114d611178bb9e20d3d5b729 (patch) | |
| tree | 30b91d98e65985a575940ed49e756697c1f049c2 /eclass | |
| parent | 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (diff) | |
gentoo resync : 23.12.2017
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41521 -> 41521 bytes | |||
| -rw-r--r-- | eclass/meson.eclass | 13 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 20 |
3 files changed, 29 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 92d5aa52eb8b..34ffa0770fff 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 2c943dd6ae27..71735fbfc67d 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -137,6 +137,19 @@ _meson_create_cross_file() { EOF } +# @FUNCTION: meson_use +# @USAGE: <USE flag> [option name] +# @DESCRIPTION: +# Given a USE flag and meson project option, outputs a string like: +# +# -Doption=true +# -Doption=false +# +# If the project option is unspecified, it defaults to the USE flag. +meson_use() { + usex "$1" "-D${2-$1}=true" "-D${2-$1}=false" +} + # @FUNCTION: meson_src_configure # @DESCRIPTION: # This is the meson_src_configure function. diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 7462ab2059b3..fd29ed1e6c05 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -73,14 +73,26 @@ case ${PV} in *_alpha*|*_beta*|*_rc*) # development release QT5_BUILD_TYPE="release" - MY_P=${QT5_MODULE}-opensource-src-${PV/_/-} + + if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then + MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-} + else + MY_P=${QT5_MODULE}-opensource-src-${PV/_/-} + fi + SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz" S=${WORKDIR}/${MY_P} ;; *) # official stable release QT5_BUILD_TYPE="release" - MY_P=${QT5_MODULE}-opensource-src-${PV} + + if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then + MY_P=${QT5_MODULE}-everywhere-src-${PV} + else + MY_P=${QT5_MODULE}-opensource-src-${PV} + fi + SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz" S=${WORKDIR}/${MY_P} ;; @@ -620,8 +632,8 @@ qt5_base_configure() { # supported; see also https://bugreports.qt.io/browse/QTBUG-36129 #-reduce-relocations - # let configure automatically detect if GNU gold is available - #-use-gold-linker + # use the system linker (gold will be selected automagically otherwise) + $(tc-ld-is-gold && echo -use-gold-linker || echo -no-use-gold-linker) # disable all platform plugins by default, override in qtgui -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient |