depends: don't use OpenGL in Qt on macOS #17676

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:macos_no_opengl changing 2 files +2 −0

fanquake commented at 3:57 PM on December 5, 2019: member

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.

build: pass -dead_strip_dylibs to ld on macOS

This strips some unused dylibs from bitcoin-qt.

From man ld:
Remove dylibs that are unreachable by the entry point or exported symbols. 
That is, suppresses the generation of load command commands for dylibs 
which supplied no symbols during the link. This option should not be 
used when linking against a dylib which is required at runtime for 
some indirect reason such as the dylib has an important initializer.

ba0cad2702

depends: don't use OpenGL in Qt on macOS 2359a4790d
fanquake added the label macOS on Dec 5, 2019
fanquake added the label Build system on Dec 5, 2019
fanquake added the label Needs gitian build on Dec 5, 2019
laanwj commented at 7:54 AM on December 6, 2019: member

Yes, OpenGL on MacOS is dead ACK 2359a4790d93ffd17b8afc2fea3775dd858ef50d

DrahtBot commented at 2:27 PM on December 6, 2019: member

Gitian builds

File	commit 6fff333c9f00cf379562ed38c2599997f9821cfb<br>(master)	commit 21721740e56453c8312921ade171ce464ba2a7bb<br>(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz	`94afa59905107ee2...`	`f1d3764cd14d290e...`
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz	`cbe33c3d4172b528...`	`21bcc99214d9ec10...`
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz	`d091cac168218e0c...`	`7f0508d3aceaa667...`
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz	`ebd3f5bb7f480a9d...`	`aeec3f0b712e2094...`
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz	`94c79aa5a768b4dc...`	`9c6d4f71012f7eda...`
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz	`c559e31391f08655...`	`48346b5a9a00c8bf...`
bitcoin-0.19.99-osx-unsigned.dmg	`1ba5805f61cd56be...`	`db05dbc6d4117605...`
bitcoin-0.19.99-osx64.tar.gz	`701efa7e02eb2599...`	`5db53e566dfad4c2...`
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz	`b5aa4bedf8ab2858...`	`34b8be6a6ea320c1...`
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz	`b3dec9053180e51f...`	`b326906692f8f0a2...`
bitcoin-0.19.99-win64-debug.zip	`adc71a666a2c99f1...`	`65f32120598c9949...`
bitcoin-0.19.99-win64-setup-unsigned.exe	`e653d7edea605ec7...`	`2fdd8a1a5d967023...`
bitcoin-0.19.99-win64.zip	`89c9779f1f14b0cf...`	`7adaee4531110f44...`
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz	`7fafc74a26ca3ed9...`	`c02346dbd25080b9...`
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz	`40e035c2ce1ab53a...`	`5b7ff35731e78af3...`
bitcoin-0.19.99.tar.gz	`1848ff553a1b601f...`	`fb10f3361bef94f0...`
bitcoin-core-linux-0.20-res.yml	`0174c728bdc5acf3...`	`5a592f1742ee9651...`
bitcoin-core-osx-0.20-res.yml	`c37690450571735b...`	`a8a3e7d4125aa996...`
bitcoin-core-win-0.20-res.yml	`71a413f93902e13a...`	`4801b59c5301bf10...`
linux-build.log	`154db7314f7cbe08...`	`d3db89f8f8505bd8...`
osx-build.log	`842bbcccf728796e...`	`22de28cee9fde388...`
win-build.log	`82825850e0c02173...`	`772df725332107eb...`
bitcoin-core-linux-0.20-res.yml.diff		`b3778e9b866ec42e...`
bitcoin-core-osx-0.20-res.yml.diff		`5934d0cf7bee18a9...`
bitcoin-core-win-0.20-res.yml.diff		`f8e41c2c896b6674...`
linux-build.log.diff		`b493cefcb4f4618f...`
osx-build.log.diff		`9c86959f9abbbe7b...`
win-build.log.diff		`dfa548204b2e6bf3...`

DrahtBot removed the label Needs gitian build on Dec 6, 2019
hebasto approved
hebasto commented at 8:44 AM on December 7, 2019: member

ACK 2359a4790d93ffd17b8afc2fea3775dd858ef50d

Ref: About OpenGL for OS X

Should contrib/macdeploy/macdeployqtplus be changed too?

laanwj commented at 9:25 AM on December 7, 2019: member

I don't think so, the only OpenGL related code there conditionally adds the OpenGL graphicssystem plugin:

            elif pluginPath == "graphicssystems/libqglgraphicssystem.dylib":
                # Deploy the opengl graphicssystem plugin only if QtOpenGL is in use
                if not deploymentInfo.usesFramework("QtOpenGL"):
                    continue

We don't use dynamically-loaded Qt plugins in the first place.

fanquake commented at 7:17 PM on December 8, 2019: member

Should contrib/macdeploy/macdeployqtplus be changed too? @laanwj is correct, nothing in that script needs to be changed.
jonasschnelli commented at 6:06 AM on December 9, 2019: contributor

Nice cleanup. utACK 2359a4790d93ffd17b8afc2fea3775dd858ef50d
laanwj referenced this in commit 91559da683 on Dec 9, 2019
laanwj merged this on Dec 9, 2019
laanwj closed this on Dec 9, 2019
fanquake deleted the branch on Dec 9, 2019
sidhujag referenced this in commit 02db4dac0c on Dec 9, 2019
fanquake referenced this in commit 668ac4722c on Dec 9, 2019
deadalnix referenced this in commit f481021ebe on Apr 3, 2020
ftrader referenced this in commit ec6ea1ef06 on Aug 17, 2020
sidhujag referenced this in commit e04dc6170d on Nov 10, 2020
MarcoFalke locked this on Dec 16, 2021

Contributors

Labels

Linked (view graph)

#17663 build: pass -dead_strip_dylibs to ld on macOS