diff options
-rw-r--r-- | classes/native.bbclass | 3 | ||||
-rw-r--r-- | classes/package.bbclass | 3 | ||||
-rw-r--r-- | conf/bitbake.conf | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/classes/native.bbclass b/classes/native.bbclass index 345bd8028d..dcedff28ff 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -62,7 +62,8 @@ export STRIP = "${HOST_PREFIX}strip" base_prefix = "${STAGING_DIR_NATIVE}" prefix = "${STAGING_DIR_NATIVE}${prefix_native}" exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" - +libdir = ${base_prefix}${libdir_native} +base_libdir = ${base_prefix}${base_libdir_native} # Since we actually install these into situ there is no staging prefix STAGING_DIR_HOST = "" STAGING_DIR_TARGET = "" diff --git a/classes/package.bbclass b/classes/package.bbclass index c3781330bb..35d9864bf7 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -614,7 +614,8 @@ python package_do_shlibs() { return lib_re = re.compile("^lib.*\.so") - libdir_re = re.compile(".*/lib$") + libdir = bb.data.getVar('base_libdir', d, True) + libdir_re = re.compile(".*%s$" % (libdir)) packages = bb.data.getVar('PACKAGES', d, True) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b0994995cb..4e80d978fb 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -72,6 +72,7 @@ export oldincludedir = "${exec_prefix}/include" base_bindir_native = "/bin" base_sbindir_native = "/sbin" sysconfdir_native = "/etc" +base_libdir_native = "/lib" prefix_native = "/usr" bindir_native = "${prefix_native}/bin" sbindir_native = "${prefix_native}/sbin" |