ldconfig-default-to-all-multilib-dirs.patch 995 B

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