diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index d35667a91d..c3f077af3a 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1263,6 +1263,7 @@ python package_do_shlibs() { | |||
1263 | lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}")) | 1263 | lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}")) |
1264 | 1264 | ||
1265 | def linux_so(root, path, file): | 1265 | def linux_so(root, path, file): |
1266 | needs_ldconfig = False | ||
1266 | cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" | 1267 | cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" |
1267 | cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) | 1268 | cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) |
1268 | fd = os.popen(cmd) | 1269 | fd = os.popen(cmd) |
@@ -1283,6 +1284,7 @@ python package_do_shlibs() { | |||
1283 | needs_ldconfig = True | 1284 | needs_ldconfig = True |
1284 | if snap_symlinks and (file != this_soname): | 1285 | if snap_symlinks and (file != this_soname): |
1285 | renames.append((os.path.join(root, file), os.path.join(root, this_soname))) | 1286 | renames.append((os.path.join(root, file), os.path.join(root, this_soname))) |
1287 | return needs_ldconfig | ||
1286 | 1288 | ||
1287 | def darwin_so(root, path, file): | 1289 | def darwin_so(root, path, file): |
1288 | fullpath = os.path.join(root, file) | 1290 | fullpath = os.path.join(root, file) |
@@ -1382,7 +1384,8 @@ python package_do_shlibs() { | |||
1382 | if targetos == "darwin" or targetos == "darwin8": | 1384 | if targetos == "darwin" or targetos == "darwin8": |
1383 | darwin_so(root, dirs, file) | 1385 | darwin_so(root, dirs, file) |
1384 | elif os.access(path, os.X_OK) or lib_re.match(file): | 1386 | elif os.access(path, os.X_OK) or lib_re.match(file): |
1385 | linux_so(root, dirs, file) | 1387 | ldconfig = linux_so(root, dirs, file) |
1388 | needs_ldconfig = needs_ldconfig or ldconfig | ||
1386 | for (old, new) in renames: | 1389 | for (old, new) in renames: |
1387 | bb.note("Renaming %s to %s" % (old, new)) | 1390 | bb.note("Renaming %s to %s" % (old, new)) |
1388 | os.rename(old, new) | 1391 | os.rename(old, new) |