[PATCH][v4] Make multi-machine toolchains to co-exist (revised again)

[PATCH][v4] Make multi-machine toolchains to co-exist (revised again)

[Tom Rini]

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

Re: [PATCH][v4] Make multi-machine toolchains to co-exist (revised again)

[Khem Raj]

On Thu, Jul 29, 2010 at 7:52 PM, Tom Rini <tom_rini@mentor.com> wrote:
> 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>

hah indecently I have been testing similar patch per our discussions on IRC
but trying to get program-transform-name to generate unique compiler names
which can coexist in <native sysroot>/usr/bin meanwhile I work on that this
portion looks ok to go in.

Signed-off-by: Khem Raj <raj.khem@gmail.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
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH][v4] Make multi-machine toolchains to co-exist (revised again)

[Richard Purdie]

On Thu, 2010-07-29 at 23:36 -0700, Khem Raj wrote:
> On Thu, Jul 29, 2010 at 7:52 PM, Tom Rini <tom_rini@mentor.com> wrote:
> > 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>
> 
> hah indecently I have been testing similar patch per our discussions on IRC
> but trying to get program-transform-name to generate unique compiler names
> which can coexist in <native sysroot>/usr/bin meanwhile I work on that this
> portion looks ok to go in.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

I've been trying to catch up with this issue and where OE is at now I'm
back. Could someone summarise where we're at please as reading through
the email threads which keep changing subject hasn't really educated me
much :/ Did changing the triplet work out or not?

In Poky I've got the putting the toolchain into:

native-sysroot/usr/bin/<package-triplet>/${TARGET_SYS}-foo

and this seems to be working out okay after a slightly bumpy ride...

Cheers,

Richard

Re: [PATCH][v4] Make multi-machine toolchains to co-exist (revised again)

[Khem Raj]

On Sat, Jul 31, 2010 at 3:59 PM, Richard Purdie <rpurdie@rpsys.net> wrote:
> On Thu, 2010-07-29 at 23:36 -0700, Khem Raj wrote:
>> On Thu, Jul 29, 2010 at 7:52 PM, Tom Rini <tom_rini@mentor.com> wrote:
>> > 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>
>>
>> hah indecently I have been testing similar patch per our discussions on IRC
>> but trying to get program-transform-name to generate unique compiler names
>> which can coexist in <native sysroot>/usr/bin meanwhile I work on that this
>> portion looks ok to go in.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> I've been trying to catch up with this issue and where OE is at now I'm
> back. Could someone summarise where we're at please as reading through
> the email threads which keep changing subject hasn't really educated me
> much :/ Did changing the triplet work out or not?

Yes it worked out to a certain extent but there was few rough edges left. I did
not pursue it more as it seemed not so desired approach.

>
> In Poky I've got the putting the toolchain into:
>
> native-sysroot/usr/bin/<package-triplet>/${TARGET_SYS}-foo

Something similar is what the v4 of the patch proposed. A difference is
that it puts the toolchain in native-sysroot/usr/${BASE_PACKAGE_ARCH}/

Koen has been trying it out and so far he has had good results.

Thanks
-Khem