[oe] [PATCH 2/4] gcc: fix libstdc/libgcc packaging on x86_64

[Khem Raj]

On (13/08/09 11:00), Michael Smith wrote:
> do_install was looking under ${D}/some long cross path/*/lib;
> needs to be lib64 on x86_64. On x86_64 base_libdir would be set to
> /lib64, so we can go by that.

this one looks ok. you need to install same for 4.3.4 atleast.

> 
> Bump INC_PR for recent gccs (4.3.3, 4.4.1). Hopefully no one is using
> older gcc for x86_64.
> 
> Signed-off-by: Michael Smith <msmith at cbnco.com>
> ---
>  recipes/gcc/gcc-4.3.3.inc         |    2 +-
>  recipes/gcc/gcc-4.4.1.inc         |    2 +-
>  recipes/gcc/gcc-package-cross.inc |   13 ++++++++-----
>  3 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
> index 5802492..4a3cb49 100644
> --- a/recipes/gcc/gcc-4.3.3.inc
> +++ b/recipes/gcc/gcc-4.3.3.inc
> @@ -7,7 +7,7 @@ LICENSE = "GPLv3"
>  
>  DEPENDS = "mpfr gmp"
>  
> -INC_PR = "r5"
> +INC_PR = "r6"
>  
>  SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
>  	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
> diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
> index a5b9d91..2759ab9 100644
> --- a/recipes/gcc/gcc-4.4.1.inc
> +++ b/recipes/gcc/gcc-4.4.1.inc
> @@ -7,7 +7,7 @@ LICENSE = "GPLv3"
>  
>  DEPENDS = "mpfr gmp"
>  
> -INC_PR = "r1"
> +INC_PR = "r2"
>  
>  FILESPATHPKG .= ":gcc-$PV"
>  
> diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
> index fa1f47f..6c4f9bb 100644
> --- a/recipes/gcc/gcc-package-cross.inc
> +++ b/recipes/gcc/gcc-package-cross.inc
> @@ -29,7 +29,9 @@ do_install () {
>          elif [  -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then
>                  mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir}
>          else
> -                mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true 
> +                # Look for .../${TARGET_SYS}/lib/libgcc_s*
> +                # (or /lib64/, on x86_64)
> +                mv -f ${D}${prefix}/*/${target_base_libdir}/libgcc_s.so* ${D}${target_base_libdir} || true 
>          fi
>  
>  
> @@ -45,10 +47,11 @@ do_install () {
>             mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true 	
>  
>          else
> -           mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true
> -           mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
> -           mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
> -           mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true
> +           # Look for .../${TARGET_SYS}/lib/lib* (or /lib64/ on x86_64)
> +           mv -f ${D}${prefix}/*/${target_base_libdir}/libstdc++.so* ${D}${target_libdir} || true
> +           mv -f ${D}${prefix}/*/${target_base_libdir}/libg2c.so* ${D}${target_libdir} || true
> +           mv -f ${D}${prefix}/*/${target_base_libdir}/libgfortran*.so* ${D}${target_libdir} || true
> +           mv -f ${D}${prefix}/*/${target_base_libdir}/libssp*.so* ${D}${target_libdir} || true
>          fi
>  
>  
> -- 
> 1.6.3
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel