diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 4 | ||||
| -rw-r--r-- | classes/package.bbclass | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index b4e78f8118..82b5311ef5 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -190,6 +190,10 @@ autotools_stage_all() { autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} + if [ "${prefix}/lib" != "${libdir}" ]; then + # python puts its files in here, make sure they are staged as well + autotools_stage_dir ${STAGE_TEMP}/${prefix}/lib ${STAGING_DIR_HOST}${layout_prefix}/lib + fi fi if [ -d ${STAGE_TEMP}/${libdir} ] then 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: |