diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-09-07 17:35:21 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-09-09 12:06:31 -0400 |
| commit | 2a205ba6fc12dd66ddf5c4f3e7b8143d2b71ca5e (patch) | |
| tree | 8724ddd03785e516ba22ca0c93cfd8da4d9f1fc6 /eclass | |
| parent | qt6-build.eclass: minor style & comments adjustments (diff) | |
| download | gentoo-2a205ba6fc12dd66ddf5c4f3e7b8143d2b71ca5e.tar.gz gentoo-2a205ba6fc12dd66ddf5c4f3e7b8143d2b71ca5e.tar.bz2 gentoo-2a205ba6fc12dd66ddf5c4f3e7b8143d2b71ca5e.zip | |
qt6-build.eclass: pass eclass' cmakeargs before the ebuild's
To allow ebuilds to override default options if ever needed.
wrt == *a*, not super necessary but still checked given this avoids
picking up a mycmakeargs that may be set in the environment (arrays
are always from ebuilds).
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt6-build.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 9de740708a6f..64cbfd296061 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -135,13 +135,7 @@ qt6-build_src_configure() { return fi - if [[ ${mycmakeargs@a} == *a* ]]; then - local mycmakeargs=("${mycmakeargs[@]}") - else - local mycmakeargs=() - fi - - mycmakeargs+=( + local defaultcmakeargs=( # see _qt6-build_create_user_facing_links -DINSTALL_PUBLICBINDIR="${QT6_PREFIX}"/bin # note that if qtbase was built with tests, this is default ON @@ -150,6 +144,12 @@ qt6-build_src_configure() { -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON ) + if [[ ${mycmakeargs@a} == *a* ]]; then + local mycmakeargs=("${defaultcmakeargs[@]}" "${mycmakeargs[@]}") + else + local mycmakeargs=("${defaultcmakeargs[@]}") + fi + cmake_src_configure } |