diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2020-05-19 14:41:48 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-05-19 14:41:48 +0200 |
| commit | cad64f778aced84efdaa04ae64f8737b86f063ab (patch) | |
| tree | a05908dd2baf169bdcc7f4de847312a13e650f5a | |
| parent | 790b8dda4455865cb8c3a47801f4304c1a43baf6 (diff) | |
| download | glibc-cad64f778aced84efdaa04ae64f8737b86f063ab.tar glibc-cad64f778aced84efdaa04ae64f8737b86f063ab.tar.gz glibc-cad64f778aced84efdaa04ae64f8737b86f063ab.tar.bz2 glibc-cad64f778aced84efdaa04ae64f8737b86f063ab.zip | |
ldconfig: Default to the new format for ld.so.cache
glibc has supported this format for close to 20 years.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | elf/ldconfig.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -35,6 +35,9 @@ Deprecated and removed features, and other changes affecting compatibility: Its implementation always returned with a failure, and the function was not declared in any header file. +* ldconfig now defaults to the new format for ld.so.cache. glibc has + already supported this format for almost 20 years. + Changes to build and runtime requirements: * powerpc64le requires GCC 7.4 or newer. This is required for supporting diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 71178d416b..3b860ad732 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -97,7 +97,7 @@ int opt_verbose; /* Format to support. */ /* 0: only libc5/glibc2; 1: both; 2: only glibc 2.2. */ -int opt_format = 1; +int opt_format = 2; /* Build cache. */ static int opt_build_cache = 1; @@ -150,7 +150,7 @@ static const struct argp_option options[] = { NULL, 'f', N_("CONF"), 0, N_("Use CONF as configuration file"), 0}, { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line. Don't build cache."), 0}, { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0}, - { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0}, + { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new (default), old, or compat"), 0}, { "ignore-aux-cache", 'i', NULL, 0, N_("Ignore auxiliary cache file"), 0}, { NULL, 0, NULL, 0, NULL, 0 } }; |