gobjectIntrospection: fix incorrect GIR shared library paths #37381
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Cherry picked for easy reviewing, does not apply to gobject introspection in master though. |
|
Failure on aarch64-linux (full log) Attempted: gobjectIntrospection Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: gobjectIntrospection Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: gobjectIntrospection Partial log (click to expand)
|
hedning
reviewed
Mar 19, 2018
| + and len(options.fallback_libpath) > 0: | ||
| + match = os.path.join(options.fallback_libpath, match) | ||
| + shlibs.append(match) | ||
| + shlibs.append(os.path.join(options.fallback_libpath, m.group(1))) |
There was a problem hiding this comment.
I'm guessing fallback_libpath is known to be empty when dealing with absolute paths?
There was a problem hiding this comment.
If a component is an absolute path, all previous components are thrown away and joining continues from the absolute path component.
hedning
approved these changes
Mar 19, 2018
When a library path contained the library name it was eagerly matched
libfwupd.so.2 => /build/fwupd-1.0.5/build/libfwupd/libfwupd.so.2 (0x00007ffff7bbd000)
^^^^^^^^^^^^^^^^^^^^^^
libgweather-3.so.15 => /build/libgweather-3.28.0/build/libgweather/libgweather-3.so.15 (0x00007ffff7bae000)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
which lead to a broken shared library path in the generated GIR file.
This patch allows the soname on the left-hand side of the arrow to
be matched to avoid the trap of the right-hand side. A negative
lookahead had to be added to select the store path, since only
the first match is taken into account.
libglib-2.0.so.0 => /nix/store/dqlc8y4phlg1hmdbwkhqfwhnxcac88d1-glib-2.56.0/lib/libglib-2.0.so.0 (0x00007ffff6400000)
This will not fix non-GNU platforms, where the soname is not printed
first, but we cannot do much without structured ldd output.
Closes: NixOS#34988
jtojnar
force-pushed
the
gir-libpath-fix
branch
from
31d1d1b
to
e468c04
Compare
GrahamcOfBorg
added
10.rebuild-darwin: 0
10.rebuild-linux: 0
and removed
10.rebuild-darwin: 501+
10.rebuild-linux: 501+
labels
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
When a library path contained the library name it was eagerly matched
which lead to a broken shared library path in the generated GIR file.
This patch allows the soname on the left-hand side of the arrow to
be matched to avoid the trap of the right-hand side. A negative
lookahead had to be added to select the store path, since only
the first match is taken into account.
This will not fix non-GNU platforms, where the soname is not printed
first, but we cannot do much without structured ldd output.
Closes: #34988
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)cc @hedning