diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-12-09 10:05:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-12-09 10:06:32 +0100 |
| commit | 91559da683dbf5de101b7722cdac341963d2433a (patch) | |
| tree | a2e3341a16363d6609c33b23b31fd7934a996edb | |
| parent | b6fb899ead9b9374a2f802666a3056012a793fa4 (diff) | |
| parent | 2359a4790d93ffd17b8afc2fea3775dd858ef50d (diff) | |
Merge #17676: depends: don't use OpenGL in Qt on macOS
2359a4790d93ffd17b8afc2fea3775dd858ef50d depends: don't use OpenGL in Qt on macOS (fanquake)
ba0cad2702e01860d3539f170343d8d9f9c5b75a build: pass -dead_strip_dylibs to ld on macOS (fanquake)
Pull request description:
Based on #17663. OpenGL on macOS was also deprecated in 10.14.
This also removes the `/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL` dylib from `bitcoin-qt`.
ACKs for top commit:
laanwj:
ACK 2359a4790d93ffd17b8afc2fea3775dd858ef50d
jonasschnelli:
utACK 2359a4790d93ffd17b8afc2fea3775dd858ef50d
hebasto:
ACK 2359a4790d93ffd17b8afc2fea3775dd858ef50d
Tree-SHA512: 39b0151832c829f6ebdc4910eb28ebbeba64539cd04eba6ce3ec75fc0f231569956ca51a1e0bffc76dd27e85643c65a155320b9b450c49e9841e12b108406d41
| -rw-r--r-- | depends/packages/qt.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index c9ffc1036c..f1d234ccf6 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -105,6 +105,7 @@ $(package)_config_opts += -no-feature-wizard $(package)_config_opts += -no-feature-xml $(package)_config_opts_darwin = -no-dbus +$(package)_config_opts_darwin += -no-opengl ifneq ($(build_os),darwin) $(package)_config_opts_darwin += -xplatform macx-clang-linux |