Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 488460 | Differences between
and this patch

Collapse All | Expand All

(-)pax-utils-0.7/lddtree.py (-3 / +6 lines)
Lines 207-213 def LoadLdpaths(root='/'): Link Here
207
      ldpaths['env'] = ParseLdPaths(env_ldpath, path='')
207
      ldpaths['env'] = ParseLdPaths(env_ldpath, path='')
208
208
209
  # Load up /etc/ld.so.conf.
209
  # Load up /etc/ld.so.conf.
210
  ldpaths['conf'] = ParseLdSoConf(root + 'etc/ld.so.conf', root=root)
210
  ldpaths['conf'] = ParseLdSoConf(root + '@GENTOO_PORTAGE_EPREFIX@/etc/ld.so.conf', root=root)
211
211
212
  return ldpaths
212
  return ldpaths
213
213
Lines 311-319 def ParseELF(path, root='/', ldpaths={'c Link Here
311
          'needed': [],
311
          'needed': [],
312
        }
312
        }
313
        # XXX: Should read it and scan for /lib paths.
313
        # XXX: Should read it and scan for /lib paths.
314
315
        slibdir=os.path.dirname(interp)
316
        libdir=os.path.dirname(slibdir) + '/usr/' + os.path.basename(slibdir)
314
        ldpaths['interp'] = [
317
        ldpaths['interp'] = [
315
          normpath(root + os.path.dirname(interp)),
318
          normpath(root + slibdir),
316
          normpath(root + '/usr' + os.path.dirname(interp)),
319
          normpath(root + libdir),
317
        ]
320
        ]
318
        break
321
        break
319
322

Return to bug 488460