diff options
author | Martin Aumüller <aumuell@reserv.at> | 2023-07-17 17:53:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-17 08:53:47 -0700 |
commit | 193e6e767854432b4e21478284ed7935364576e5 (patch) | |
tree | 676b8c0113f6f66dead67b1f804105c2904d25d3 /bin | |
parent | dc216adde2d190fffba6306620f5159848f6e17c (diff) | |
download | spack-193e6e767854432b4e21478284ed7935364576e5.tar.gz spack-193e6e767854432b4e21478284ed7935364576e5.tar.bz2 spack-193e6e767854432b4e21478284ed7935364576e5.tar.xz spack-193e6e767854432b4e21478284ed7935364576e5.zip |
qt-base: fix build on macos, when +network (#38519)
* qt-base: always link to GSS framework on macOS
On macos, the code in src/network/kernel/qauthenticator.cpp
unconditionally includes the header from the GSS framework, so we should
link against it.
This applies two patches from the dev branch. They are to be cherry-picked
into the 6.5 (probably released with 6.5.2) and 6.6 branches, but they
apply against 6.3.2 as well.
* qt-base: disable libproxy on macOS
src/network/CMakeLists.txt disables it on MACOS anyway. And as it is not
found without pkg-config, building with +network would break because of
the feature being explicitly enabled.
* qt-base: don't depend on pkgconfig on macOS
On macOS, usage of pkg-config is disabled by unsetting
PKG_CONFIG_EXECUTABLE, unless the feature pkg-config is requested explicitly.
* qt-base: don't depend on at-spi2-core on macOS
Does not build on macOS and seems to be targeted at linux. Qt6 on
homebrew does not depend on it, either.
* qt-base: fix long lines
* qt-base: restrict use of pkgconfig to linux
yes, probably not needed on windows, either
Co-authored-by: Alec Scott <alec@bcs.sh>
* qt-base: disable libproxy on Windows as well
according to src/network/CMakeLists.txt it's only used on Unix
* qt-base: improvements based on reviewer suggestions
---------
Co-authored-by: Alec Scott <alec@bcs.sh>
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions