1Upstream-Status: Inappropriate [embedded specific] 2 3make ldconfig default to both /lib+/usr/lib, /lib32+/usr/lib32 and 4/lib64+/usr/lib64 on bi-ABI architectures. 5 6--- 7 ldconfig.c | 10 ++++++++++ 8 1 file changed, 10 insertions(+) 9 10diff -urpN a/ldconfig.c b/ldconfig.c 11--- a/ldconfig.c 12+++ b/ldconfig.c 13@@ -52,7 +52,11 @@ 14 15 #define SYSCONFDIR "/etc" 16 #define LIBDIR "/usr/lib" 17+#define LIBDIR32 "/usr/lib32" 18+#define LIBDIR64 "/usr/lib64" 19 #define SLIBDIR "/lib" 20+#define SLIBDIR32 "/lib32" 21+#define SLIBDIR64 "/lib64" 22 # define N_(msgid) msgid 23 #define _(msg) msg 24 25@@ -1373,6 +1377,12 @@ main (int argc, char **argv) 26 add_system_dir (SLIBDIR); 27 if (strcmp (SLIBDIR, LIBDIR)) 28 add_system_dir (LIBDIR); 29+ add_system_dir (SLIBDIR32); 30+ if (strcmp (SLIBDIR32, LIBDIR32)) 31+ add_system_dir (LIBDIR32); 32+ add_system_dir (SLIBDIR64); 33+ if (strcmp (SLIBDIR64, LIBDIR64)) 34+ add_system_dir (LIBDIR64); 35 } 36 37 const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; 38