File pax-utils-handle-lib64.patch of Package pax-utils
--- pax-utils-0.9.2.orig/scanelf.c
+++ pax-utils-0.9.2/scanelf.c
@@ -1967,14 +1967,14 @@ static void load_ld_cache_config(const c
scan_l = scan_ul = scan_ull = false;
array_for_each(ldpaths, n, ldpath) {
- if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = true;
- if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = true;
- if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = true;
+ if (!scan_l && !strcmp(ldpath, "/lib") && !strcmp(ldpath, "/lib64")) scan_l = true;
+ if (!scan_ul && !strcmp(ldpath, "/usr/lib") && !strcmp(ldpath, "/usr/lib64")) scan_ul = true;
+ if (!scan_ull && !strcmp(ldpath, "/usr/local/lib") && !strcmp(ldpath, "/usr/local/lib64")) scan_ull = true;
}
- if (!scan_l) xarraypush_str(ldpaths, "/lib");
- if (!scan_ul) xarraypush_str(ldpaths, "/usr/lib");
- if (!scan_ull) xarraypush_str(ldpaths, "/usr/local/lib");
+ if (!scan_l) { xarraypush_str(ldpaths, "/lib"); xarraypush_str(ldpaths, "/lib64"); }
+ if (!scan_ul) { xarraypush_str(ldpaths, "/usr/lib");xarraypush_str(ldpaths, "/usr/lib64"); }
+ if (!scan_ull) { xarraypush_str(ldpaths, "/usr/local/lib"); xarraypush_str(ldpaths, "/usr/local/lib64"); }
}
/* scan /etc/ld.so.conf for paths */