All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][v4] Make multi-machine toolchains to co-exist (revised again)
@ 2010-07-30  2:52 Tom Rini
  2010-07-30  6:36 ` Khem Raj
  0 siblings, 1 reply; 4+ messages in thread
From: Tom Rini @ 2010-07-30  2:52 UTC (permalink / raw)
  To: openembedded-devel

Hey all,

As one of the folks who suggested something else, here's my take.

We modify the prefix for cross stuff to dump everything into
MULTIMACH_TARGET_SYS in the sysroot.

Pro: It should work for all the cases
Con: We're back to having a 'special' directory of cross stuff
Pro: It's separate but still valid for $ORIGIN mangling, which is the
other problem we had before.

I've got a qemuarm console-image and then beagleboard console-image 
build going now and that's going to take time.

Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index db86192..b3f74a2 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -44,9 +44,9 @@ target_base_libdir := "${base_libdir}"
  target_prefix := "${prefix}"

  # Overrides for paths
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}/${MULTIMACH_TARGET_SYS}"
  base_prefix = "${STAGING_DIR_NATIVE}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix =
"${STAGING_DIR_NATIVE}${prefix_native}/${MULTIMACH_TARGET_SYS}"
  base_sbindir = "${base_prefix}/bin"
  sbindir = "${exec_prefix}/bin"

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d523519..23281fd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -299,7 +299,7 @@ STAGING_DIR_JAVA = "${STAGING_DIR}/java"
  STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
  STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
  STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
-STAGING_BINDIR_CROSS  =
"${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
+STAGING_BINDIR_CROSS  =
"${STAGING_DIR_NATIVE}${prefix_native}/${MULTIMACH_TARGET_SYS}${base_bindir_native}"
  STAGING_BINDIR_CROSS_BASEPKG =
"${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
  STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
  STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"


-- 
Tom Rini
Mentor Graphics Corporation




^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-08-01  8:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-30  2:52 [PATCH][v4] Make multi-machine toolchains to co-exist (revised again) Tom Rini
2010-07-30  6:36 ` Khem Raj
2010-07-31 22:59   ` Richard Purdie
2010-08-01  8:14     ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.