diff options
| -rw-r--r-- | meta/classes/cross.bbclass | 7 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index f9fd07a9a2..81358ec8dd 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -38,11 +38,12 @@ DEPENDS_GETTEXT = "gettext-native" # Path mangling needed by the cross packaging # Note that we use := here to ensure that libdir and includedir are # target paths. -target_libdir := "${libdir}" -target_includedir := "${includedir}" -target_base_libdir := "${base_libdir}" +target_base_prefix := "${base_prefix}" target_prefix := "${prefix}" target_exec_prefix := "${exec_prefix}" +target_base_libdir = "${target_base_prefix}/${baselib}" +target_libdir = "${target_exec_prefix}/${baselib}" +target_includedir := "${includedir}" # Overrides for paths CROSS_TARGET_SYS_DIR = "${MULTIMACH_TARGET_SYS}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 975e24c071..e768df5f7f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -1,6 +1,13 @@ ################################################################## # Standard target filesystem paths. ################################################################## +# +# If changing these values, beware that native/cross/nativesdk bbclass +# files may also need changes to keep in sync. +# + +# Used by multilib code to change the library paths +baselib = "lib" # Path prefixes export base_prefix = "" @@ -10,7 +17,7 @@ export exec_prefix = "/usr" # Base paths export base_bindir = "${base_prefix}/bin" export base_sbindir = "${base_prefix}/sbin" -export base_libdir = "${base_prefix}/lib" +export base_libdir = "${base_prefix}/${baselib}" # Architecture independent paths export datadir = "${prefix}/share" @@ -26,13 +33,11 @@ export docdir = "${datadir}/doc" export bindir = "${exec_prefix}/bin" export sbindir = "${exec_prefix}/sbin" export libexecdir = "${exec_prefix}/libexec" -export libdir = "${exec_prefix}/lib" +export libdir = "${exec_prefix}/${baselib}" export includedir = "${exec_prefix}/include" export oldincludedir = "${exec_prefix}/include" -# -# These must match the various bbclass layout definitions -# +# Linkage between native/cross/nativesdk layouts base_bindir_native = "/bin" base_sbindir_native = "/sbin" sysconfdir_native = "/etc" |