[OE-core] [PATCH 1/1] gcc-cross-intermediate: revise the 64bithack.patch for multilib case

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/14/2011 06:32 AM, Yu Ke wrote:
> current gcc-cross-intermediate has build failure in qemux86-64 lib64 
> multilib case. the reason is that it still use lib instead of lib64 
> while do_install use the libdir i.e. lib64
> 
> so this patch fix this issue by making gcc honour the libdir.

I think similar patch should be done to ppc and mips as well.

> 
> CC: Kumar Gala <galak at kernel.crashing.org> CC: Richard Purdie
> <richard.purdie at linuxfoundation.org>
> 
> Signed-off-by: Yu Ke <ke.yu at intel.com> --- 
> meta/recipes-devtools/gcc/gcc-4.6.inc             |    2 +- 
> meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch |   16
> +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
> b/meta/recipes-devtools/gcc/gcc-4.6.inc index 0a148b4..ff8ca24
> 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++
> b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require
> gcc-common.inc
> 
> -PR = "r7" +PR = "r8"
> 
> # Third digit in PV should be incremented after a minor release #
> happens from this branch on gcc e.g. currently its 4.6.0 diff --git
> a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
> b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch index
> 4b846bb..c1129ca 100644 ---
> a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch +++
> b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch @@ -5,18 +5,20 @@
> By default gcc places 64 bit libs in a lib64 directory. This makes it
> use
> 
> RP 25/7/10
> 
> +revise it to honour base_libdir + +Yu Ke <ke.yu at intel.com> Aug 13,
> 2011 + Index: gcc-4.6.0/gcc/config/i386/t-linux64 
> =================================================================== 
> --- gcc-4.6.0.orig/gcc/config/i386/t-linux64 +++
> gcc-4.6.0/gcc/config/i386/t-linux64 -@@ -24,8 +24,8 @@ - #
> MULTILIB_OSDIRNAMES according to what is found on the target. - +@@
> -25,7 +25,7 @@ + MULTILIB_OPTIONS = m64/m32 --MULTILIB_DIRNAMES = 64
> 32 + MULTILIB_DIRNAMES = 64 32 -MULTILIB_OSDIRNAMES = ../lib64 $(if
> $(wildcard $(shell echo
> $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 
> -+MULTILIB_DIRNAMES = . 32 -+MULTILIB_OSDIRNAMES = . $(if $(wildcard
> $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 
> - ++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) $(if
> $(wildcard $(shell echo
> $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + LIBGCC =
> stmp-multilib INSTALL_LIBGCC = install-multilib

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk5H51YACgkQuwUzVZGdMxQ8jgCfXo7MQSziJZqLCMjxgsakiac4
2UoAn3BoazvtV+hlGkGhMCBk9sOGuvYg
=emFC
-----END PGP SIGNATURE-----