diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-04-25 14:04:57 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-04-26 15:10:16 +0200 |
commit | 12fb2cfa11cb2e0b7deb00025b0f2c6a91519d98 (patch) | |
tree | 82bcb069afa3a16a26aba8e7f8de7f808d621538 /src/platformsupport | |
parent | f056eed02e959e639c09e2912e7545e79c0ea9ea (diff) |
macdeployqt: Ignore repeated references to binary when parsing otool -L
macdeployqt doesn't know or care about universal build (yet), and
will just scan all the lines produced by otool -L as if they were for
a single architecture, ignoring any lines it doesn't recognize.
This fails when the second arch starts off with a reference to the
binary we're processing, which then gets interpreted as a dependency
of itself. If that binary doesn't have a path, we end up looking for
a match in /usr/lib, which we can't find in the best case, or actually
end up deploying from an incompatible Qt version in the worst case.
Ideally we'd teach macdeployqt about the multiple slices, bur for now
we work around it by skipping any references to dependent libraries
that match the binary itself.
Fixes: QTBUG-102607
Pick-to: 6.2 6.3 5.15
Change-Id: Ia039fafdce90896e61aab90b9c8ac52543cc2c8c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/platformsupport')
0 files changed, 0 insertions, 0 deletions