summaryrefslogtreecommitdiff
path: root/classes/package.bbclass
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2008-10-21 12:03:09 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2008-10-21 12:03:09 +0200
commitd05dca7b0d286e1df13824b99cd5f262ade439e2 (patch)
tree7c7f247f1a88c405063d1d7108db11d181c3dbb1 /classes/package.bbclass
parent313753ac3e740c8ff54f0b0ddb2acb659033fe85 (diff)
parent96198fd96bd2ddddab9708f3c6c3f527253130d8 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/package.bbclass')
-rw-r--r--classes/package.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index a12bfb0a21..0601885046 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -594,6 +594,11 @@ python package_do_shlibs() {
else:
snap_symlinks = False
+ if (bb.data.getVar('USE_LDCONFIG', d, True) or "1") == "1":
+ use_ldconfig = True
+ else:
+ use_ldconfig = False
+
needed = {}
private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
for pkg in packages.split():
@@ -647,7 +652,7 @@ python package_do_shlibs() {
fd.write(ver + '\n')
fd.close()
package_stagefile(shver_file, d)
- if needs_ldconfig:
+ if needs_ldconfig and use_ldconfig:
bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
if not postinst: