[oe-commits] Leon Woestenberg : cross.bbclass: Fix STAGING_{INC, LIB}DIR for -cross.

[git version control]

Module: openembedded.git
Branch: likewise/nios2
Commit: 740256e1a5464871d5f44d144860b5341588dc82
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=740256e1a5464871d5f44d144860b5341588dc82

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Tue Nov 24 12:16:21 2009 +0100

cross.bbclass: Fix STAGING_{INC,LIB}DIR for -cross.

Our STAGING_INCDIR for -cross packages contains two concatenated absolute paths,
one based of CROSS_DIR, one based of STAGING_DIR.

Both are absolute, based against TMPDIR, the construction is was follows:

CROSS_DIR = ${TMPDIR}/cross/$BASE_PACKAGE_ARCH
prefix = ${CROSS_DIR}
exec_prefix = ${prefix}
includedir = ${exec_prefix}/include

STAGING_DIR = ${TMPDIR}/staging
BASEPKG_HOST_SYS=${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}
STAGING_DIR_HOST=${STAGIG_DIR}/$BASEPKG_HOST_SYS}

which are then concatenated for -cross packages as:

STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"

Use the Poky approach instead, which introduces new variables for the
target stuff.

Signed-off-by: Leon Woestenberg <leon at sidebranch.com>

---

 classes/cross.bbclass |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 1de157c..9d5297b 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -27,6 +27,14 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
 
 TOOLCHAIN_OPTIONS = ""
 
+# Path mangling needed by the cross packaging
+# Note that we use := here to ensure that libdir and includedir are
+# target paths, not CROSS_DIR paths.
+target_libdir := "${libdir}"
+target_includedir := "${includedir}"
+target_base_libdir := "${base_libdir}"
+target_prefix := "${prefix}"
+
 # Overrides for paths
 prefix = "${CROSS_DIR}"
 base_prefix = "${prefix}"