From: Sam James Date: Sat, 6 Jun 2026 19:32:27 +0000 (+0100) Subject: elf: don't clobber ld.so.conf in tst-glibc-hwcaps-prepend-cache [BZ #34210] X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;p=thirdparty%2Fglibc.git elf: don't clobber ld.so.conf in tst-glibc-hwcaps-prepend-cache [BZ #34210] dbe5065f2166be20e57a24f246a40d50e001a05d and ae589cb84df10825fc545a45c7007a5f79409bf1 cater for setups where ld.so.conf{,.d} is required to find runtime support libraries, but tst-glibc-hwcaps-prepend-cache clobbers the created ld.so.conf with its own entry. Fix it to instead use the ld.so.conf.d created in ae589cb84df10825fc545a45c7007a5f79409bf1 to co-exist with existing entries. Bug: https://bugs.gentoo.org/976773 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31901 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34210 Tested-by: Andreas K. Hüttel Reported-by: Eli Schwartz Reviewed-by: Andreas K. Hüttel --- diff --git a/elf/tst-glibc-hwcaps-prepend-cache.c b/elf/tst-glibc-hwcaps-prepend-cache.c index 8a80ceed3e..98bd1ef99e 100644 --- a/elf/tst-glibc-hwcaps-prepend-cache.c +++ b/elf/tst-glibc-hwcaps-prepend-cache.c @@ -46,7 +46,7 @@ do_test (void) { /* Install the default implementation of libmarkermod1.so. */ - char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); + char *conf_path = xasprintf ("%s/ld.so.conf.d/hwcaps.conf", support_sysconfdir_prefix); xmkdirp (support_sysconfdir_prefix, 0777); support_write_file_string (conf_path, "/glibc-test/lib\n"); free (conf_path);