From: Steve Langasek <steve.langasek@linaro.org>
Date: Sat, 2 Oct 2021 12:47:40 +0000 (+0100)
Subject: make ldconfig use the built-in system paths
X-Git-Tag: archive/raspbian/2.31-13+rpi1+deb11u2^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=99bbb44997352bf5a911b2f6efa85c50619885d3;p=glibc.git

make ldconfig use the built-in system paths

Bug-Ubuntu: https://bugs.launchpad.net/bugs/736932

Make ldconfig use the same view of built-in system paths that ld.so does,
instead of just using SLIBDIR and LIBDIR; this corrects a failure of
ldconfig to cache libraries in non-multiarch directories when building for
multiarch, even though they're on the system path.

Gbp-Pq: Topic any
Gbp-Pq: Name local-ldconfig-multiarch.diff
---

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 03a8d5033..6af0df2a2 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -63,6 +63,17 @@
 #define PATH_MAX 1024
 #endif
 
+/* Get the generated information about the trusted/standard directories.  */
+#include "trusted-dirs.h"
+
+static const char system_dirs[] = SYSTEM_DIRS;
+static const size_t system_dirs_len[] =
+{
+  SYSTEM_DIRS_LEN
+};
+#define nsystem_dirs_len \
+  (sizeof (system_dirs_len) / sizeof (system_dirs_len[0]))
+
 static const struct
 {
   const char *name;
@@ -1385,12 +1396,19 @@ main (int argc, char **argv)
 
   if (!opt_only_cline)
     {
+      const char *strp = system_dirs;
+      size_t idx = 0;
+
       parse_conf (config_file, true);
 
       /* Always add the standard search paths.  */
-      add_system_dir (SLIBDIR);
-      if (strcmp (SLIBDIR, LIBDIR))
-	add_system_dir (LIBDIR);
+      do
+        {
+          add_system_dir (strp);
+          strp += system_dirs_len[idx] + 1;
+          idx++;
+        }
+      while (idx < nsystem_dirs_len);
     }
 
   const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;