glibc: Rebuild with working patches to tame ldconfig #415
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
The two patches applied were supposed to change the behaviour of
ldconfig. It should not generate the symlinks for the shared libraries
by default and it should not remove stale symlinks by default.
However, the first patch was faulty and didn't actually change the
default. It was corrected (with a -v2 appended to its name). The second
patch had to be rebased on the first on.
Rebuild with fixed patches.
Increase build number.
diff /src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default.patch /src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default-v2.patch
1c1
< From ed11660d1f553413c0ffaf283c3272dc492b56ac Mon Sep 17 00:00:00 2001
---
> From fbee17a0750763583dd4c8e51dfd16adae652104 Mon Sep 17 00:00:00 2001
9,10c9,10
< elf/ldconfig.c | 6 +++++-
< 1 file changed, 5 insertions(+), 1 deletion(-)
---
> elf/ldconfig.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
13c13
< index 99caf9e..5e3dbfc 100644
---
> index 99caf9e..3515738 100644
15a16,24
> @@ -102,7 +102,7 @@ static int opt_build_cache = 1;
>
> /* Enable symbolic link processing. If set, create or update symbolic
> links, and remove stale symbolic links. */
> -static int opt_link = 1;
> +static int opt_link = 0;
>
> /* Only process directories specified on the command line. */
> static int opt_only_cline;
diff /src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default.patch /src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default-v2.patch
1c1
< From 61b9ad6e5f8bb5c3180f4eb7f16810f27789b32f Mon Sep 17 00:00:00 2001
---
> From 498f603053a2e0e0c35e8146070cc7a797b3a184 Mon Sep 17 00:00:00 2001
12c12
< index 5e3dbfc..6f79f59 100644
---
> index 3515738..5c5eeb6 100644
17c17
< static int opt_link = 1;
---
> static int opt_link = 0;
pmenzel
changed the title
Sign in
to join this conversation on GitHub.
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.
The patches modifying ldconfig were wrong, so ldconfig messed up some links (/usr/lib/libGL.so) and caused problems. Hopefully this is corrected in this update.
This update can not be installed with
because bee update is to stupid and would remove symlinks which exists in both revisions. It can be
done by
Please merge if it looks okay.