[oe] [PATCH] gcc-package-cross.inc: install shlibs lists into target dir instead of host dir
Khem Raj
raj.khem at gmail.com
Mon Sep 13 18:13:05 UTC 2010
you have my ack to revert
d2a283ad002660e46b2f8d40a8ddfabad457d8a4 as well in that case this
patch may not be needed
Thanks
-Khem
On Mon, Sep 13, 2010 at 1:23 AM, Koen Kooi <koen.kooi at gmail.com> wrote:
> From: Koen Kooi <k-kooi at ti.com>
>
> This fixes the "libstdc++ isn't installed into my rootfs anymore" type of problems after a full rebuild of all packages
>
> This bumps PR of gcc to force a rebuild, but that is *NOT* enough to fix the packages built before this fix, those still need rebuilding
>
> Signed-off-by: Koen Kooi <k-kooi at ti.com>
> Acked-by: Khem Raj <raj.khem at gmail.com>
> Acked-by: Dallas Foley <dfoley at telus.net>
>
> ---
> recipes/gcc/gcc-3.3.4.inc | 2 +-
> recipes/gcc/gcc-3.4.3.inc | 2 +-
> recipes/gcc/gcc-3.4.4.inc | 2 +-
> recipes/gcc/gcc-3.4.6.inc | 2 ++
> recipes/gcc/gcc-4.0.0.inc | 2 ++
> recipes/gcc/gcc-4.0.2.inc | 2 ++
> recipes/gcc/gcc-4.1.0.inc | 2 +-
> recipes/gcc/gcc-4.1.1.inc | 2 +-
> recipes/gcc/gcc-4.1.2.inc | 2 +-
> recipes/gcc/gcc-4.2.1.inc | 2 +-
> recipes/gcc/gcc-4.2.2.inc | 2 +-
> recipes/gcc/gcc-4.2.3.inc | 2 +-
> recipes/gcc/gcc-4.2.4.inc | 2 +-
> recipes/gcc/gcc-4.3.1.inc | 2 +-
> recipes/gcc/gcc-4.3.2.inc | 2 +-
> recipes/gcc/gcc-4.3.3.inc | 2 +-
> recipes/gcc/gcc-4.3.4.inc | 2 +-
> recipes/gcc/gcc-4.4.1.inc | 2 +-
> recipes/gcc/gcc-4.4.2.inc | 2 +-
> recipes/gcc/gcc-4.4.4.inc | 2 +-
> recipes/gcc/gcc-4.5.inc | 2 +-
> recipes/gcc/gcc-package-cross.inc | 2 ++
> 22 files changed, 26 insertions(+), 18 deletions(-)
>
> diff --git a/recipes/gcc/gcc-3.3.4.inc b/recipes/gcc/gcc-3.3.4.inc
> index 1185c65..29c1473 100644
> --- a/recipes/gcc/gcc-3.3.4.inc
> +++ b/recipes/gcc/gcc-3.3.4.inc
> @@ -1,6 +1,6 @@
> require gcc-common.inc
>
> -INC_PR = "r12"
> +INC_PR = "r13"
>
> SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://arm-gotoff.dpatch;apply=yes;striplevel=0 \
> diff --git a/recipes/gcc/gcc-3.4.3.inc b/recipes/gcc/gcc-3.4.3.inc
> index cfee4d1..cf615a1 100644
> --- a/recipes/gcc/gcc-3.4.3.inc
> +++ b/recipes/gcc/gcc-3.4.3.inc
> @@ -1,6 +1,6 @@
> require gcc-common.inc
>
> -INC_PR = "r20"
> +INC_PR = "r21"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://gcc34-reverse-compare.patch \
> diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc
> index 6d4d266..99e680f 100644
> --- a/recipes/gcc/gcc-3.4.4.inc
> +++ b/recipes/gcc/gcc-3.4.4.inc
> @@ -1,6 +1,6 @@
> require gcc-common.inc
>
> -INC_PR = "r16"
> +INC_PR = "r17"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://gcc34-reverse-compare.patch \
> diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc
> index b6b01e3..5296f26 100644
> --- a/recipes/gcc/gcc-3.4.6.inc
> +++ b/recipes/gcc/gcc-3.4.6.inc
> @@ -1,5 +1,7 @@
> require gcc-common.inc
>
> +INC_PR = "r1"
> +
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://gcc34-reverse-compare.patch \
> file://gcc34-arm-ldm.patch \
> diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc
> index dd48595..d6a7f33 100644
> --- a/recipes/gcc/gcc-4.0.0.inc
> +++ b/recipes/gcc/gcc-4.0.0.inc
> @@ -1,5 +1,7 @@
> require gcc-common.inc
>
> +INC_PR = "r1"
> +
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
> index 16584ec..63f9772 100644
> --- a/recipes/gcc/gcc-4.0.2.inc
> +++ b/recipes/gcc/gcc-4.0.2.inc
> @@ -1,5 +1,7 @@
> require gcc-common.inc
>
> +INC_PR = "r1"
> +
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc
> index d3c5079..8da06aa 100644
> --- a/recipes/gcc/gcc-4.1.0.inc
> +++ b/recipes/gcc/gcc-4.1.0.inc
> @@ -1,6 +1,6 @@
> require gcc-common.inc
>
> -INC_PR = "r12"
> +INC_PR = "r13"
>
> DEFAULT_PREFERENCE = "-1"
>
> diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc
> index 88c9d7e..c261138 100644
> --- a/recipes/gcc/gcc-4.1.1.inc
> +++ b/recipes/gcc/gcc-4.1.1.inc
> @@ -3,7 +3,7 @@ require gcc-common.inc
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r3"
> +INC_PR = "r4"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://100-uclibc-conf.patch \
> diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
> index c102b05..114f053 100644
> --- a/recipes/gcc/gcc-4.1.2.inc
> +++ b/recipes/gcc/gcc-4.1.2.inc
> @@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native"
>
> COMPATIBLE_TARGET_SYS = "."
>
> -INC_PR = "r24"
> +INC_PR = "r25"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://100-uclibc-conf.patch \
> diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc
> index fbee758..e5506c7 100644
> --- a/recipes/gcc/gcc-4.2.1.inc
> +++ b/recipes/gcc/gcc-4.2.1.inc
> @@ -3,7 +3,7 @@ require gcc-common.inc
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r22"
> +INC_PR = "r23"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://100-uclibc-conf.patch \
> diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc
> index 1c7f9d0..a1f9cd3 100644
> --- a/recipes/gcc/gcc-4.2.2.inc
> +++ b/recipes/gcc/gcc-4.2.2.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r18"
> +INC_PR = "r19"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://100-uclibc-conf.patch \
> diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc
> index 6d29b0e..988740e 100644
> --- a/recipes/gcc/gcc-4.2.3.inc
> +++ b/recipes/gcc/gcc-4.2.3.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r19"
> +INC_PR = "r20"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://100-uclibc-conf.patch \
> diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
> index db09c6e..974471e 100644
> --- a/recipes/gcc/gcc-4.2.4.inc
> +++ b/recipes/gcc/gcc-4.2.4.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r13"
> +INC_PR = "r14"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://100-uclibc-conf.patch \
> diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc
> index 645c14a..7829f23 100644
> --- a/recipes/gcc/gcc-4.3.1.inc
> +++ b/recipes/gcc/gcc-4.3.1.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r23"
> +INC_PR = "r24"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
> diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc
> index 2d3118c..aa9cd48 100644
> --- a/recipes/gcc/gcc-4.3.2.inc
> +++ b/recipes/gcc/gcc-4.3.2.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r13"
> +INC_PR = "r14"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
> diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
> index 11d09fa..a3392c0 100644
> --- a/recipes/gcc/gcc-4.3.3.inc
> +++ b/recipes/gcc/gcc-4.3.3.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r16"
> +INC_PR = "r17"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
> diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc
> index b8df9f0..5aef5e5 100644
> --- a/recipes/gcc/gcc-4.3.4.inc
> +++ b/recipes/gcc/gcc-4.3.4.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r11"
> +INC_PR = "r12"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
> diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
> index 8cfb47f..acb5371 100644
> --- a/recipes/gcc/gcc-4.4.1.inc
> +++ b/recipes/gcc/gcc-4.4.1.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r10"
> +INC_PR = "r11"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
> diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc
> index 3bb9f53..42e8d54 100644
> --- a/recipes/gcc/gcc-4.4.2.inc
> +++ b/recipes/gcc/gcc-4.4.2.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r4"
> +INC_PR = "r5"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
> file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
> diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc
> index 51337e1..1bc7c12 100644
> --- a/recipes/gcc/gcc-4.4.4.inc
> +++ b/recipes/gcc/gcc-4.4.4.inc
> @@ -8,7 +8,7 @@ LICENSE = "GPLv3"
> DEPENDS = "mpfr gmp"
> NATIVEDEPS = "mpfr-native gmp-native"
>
> -INC_PR = "r5"
> +INC_PR = "r6"
>
> SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc444tarbz2 \
> file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
> diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc
> index 08d7058..b7bd87b 100644
> --- a/recipes/gcc/gcc-4.5.inc
> +++ b/recipes/gcc/gcc-4.5.inc
> @@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf"
> NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
>
>
> -INC_PR = "r8"
> +INC_PR = "r9"
>
> SRCREV = "163322"
> PV = "4.5"
> diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
> index 0c4ea2d..59e7dde 100644
> --- a/recipes/gcc/gcc-package-cross.inc
> +++ b/recipes/gcc/gcc-package-cross.inc
> @@ -2,6 +2,8 @@ PACKAGE_STRIP ?= ""
> OLD_PACKAGE_STRIP := "${PACKAGE_STRIP}"
> PACKAGE_STRIP = "no"
>
> +SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
> +
> PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
>
> # Called from within gcc-cross, so libdir is set wrong
> --
> 1.6.6.1
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
-Khem
More information about the Openembedded-devel
mailing list