gcc-package-cross.inc: install shlibs lists into target dir instead of host dir
PATCH 1/1 gcc-package-cross.inc: install shlibs lists into target dir instead of host dir
From: Koen Kooi <[email protected]>
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
--- 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(-)
recipes/gcc/gcc-3.3.4.inc +1 -1
@@ -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 \
recipes/gcc/gcc-3.4.3.inc +1 -1
@@ -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 \
recipes/gcc/gcc-3.4.4.inc +1 -1
@@ -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 \
recipes/gcc/gcc-3.4.6.inc +2 -0
@@ -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 \
recipes/gcc/gcc-4.0.0.inc +2 -0
@@ -1,5 +1,7 @@ require gcc-common.inc +INC_PR = "r1" + DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native"
recipes/gcc/gcc-4.0.2.inc +2 -0
@@ -1,5 +1,7 @@ require gcc-common.inc +INC_PR = "r1" + DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native"
recipes/gcc/gcc-4.1.0.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r12" +INC_PR = "r13" DEFAULT_PREFERENCE = "-1"
recipes/gcc/gcc-4.1.1.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.1.2.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.2.1.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.2.2.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.2.3.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.2.4.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.3.1.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.3.2.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.3.3.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.3.4.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.4.1.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.4.2.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.4.4.inc +1 -1
@@ -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 \
recipes/gcc/gcc-4.5.inc +1 -1
@@ -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"
recipes/gcc/gcc-package-cross.inc +2 -0
@@ -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
Signature · 1 line
1.6.6.1
you have my ack to revert d2a283ad002660e46b2f8d40a8ddfabad457d8a4 as well in that case this patch may not be needed
Thanks
-Khem
Quoted 323 lines · Koen Kooi
From: Koen Kooi <[email protected]>
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 <[email protected]>Acked-by Khem Raj <[email protected]>Acked-by Dallas Foley <[email protected]>---
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(-)recipes/gcc/gcc-3.3.4.inc +0
-0@@ -1,6 +1,6 @@require gcc-common.inc
recipes/gcc/gcc-3.3.4.inc +1
-1-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 \recipes/gcc/gcc-3.4.3.inc +0
-0@@ -1,6 +1,6 @@require gcc-common.inc
recipes/gcc/gcc-3.4.3.inc +1
-1-INC_PR = "r20" +INC_PR = "r21"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://gcc34-reverse-compare.patch \recipes/gcc/gcc-3.4.4.inc +0
-0@@ -1,6 +1,6 @@require gcc-common.inc
recipes/gcc/gcc-3.4.4.inc +1
-1-INC_PR = "r16" +INC_PR = "r17"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://gcc34-reverse-compare.patch \recipes/gcc/gcc-3.4.6.inc +0
-0@@ -1,5 +1,7 @@require gcc-common.inc
recipes/gcc/gcc-3.4.6.inc +2
-0+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 \recipes/gcc/gcc-4.0.0.inc +0
-0@@ -1,5 +1,7 @@require gcc-common.inc
recipes/gcc/gcc-4.0.0.inc +2
-0+INC_PR = "r1" +DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.0.2.inc +0
-0@@ -1,5 +1,7 @@require gcc-common.inc
recipes/gcc/gcc-4.0.2.inc +2
-0+INC_PR = "r1" +DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.1.0.inc +0
-0@@ -1,6 +1,6 @@require gcc-common.inc
recipes/gcc/gcc-4.1.0.inc +1
-1-INC_PR = "r12" +INC_PR = "r13"DEFAULT_PREFERENCE = "-1"
recipes/gcc/gcc-4.1.1.inc +0
-0@@ -3,7 +3,7 @@ require gcc-common.incDEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.1.1.inc +1
-1-INC_PR = "r3" +INC_PR = "r4"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://100-uclibc-conf.patch \recipes/gcc/gcc-4.1.2.inc +0
-0@@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native"COMPATIBLE_TARGET_SYS = "."
recipes/gcc/gcc-4.1.2.inc +1
-1-INC_PR = "r24" +INC_PR = "r25"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.1.inc +0
-0@@ -3,7 +3,7 @@ require gcc-common.incDEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.2.1.inc +1
-1-INC_PR = "r22" +INC_PR = "r23"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.2.inc +0
-0@@ -4,7 +4,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.2.2.inc +1
-1-INC_PR = "r18" +INC_PR = "r19"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.3.inc +0
-0@@ -4,7 +4,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.2.3.inc +1
-1-INC_PR = "r19" +INC_PR = "r20"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.4.inc +0
-0@@ -4,7 +4,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.2.4.inc +1
-1-INC_PR = "r13" +INC_PR = "r14"SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
file://100-uclibc-conf.patch \recipes/gcc/gcc-4.3.1.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.3.1.inc +1
-1-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 \recipes/gcc/gcc-4.3.2.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.3.2.inc +1
-1-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 \recipes/gcc/gcc-4.3.3.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.3.3.inc +1
-1-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 \recipes/gcc/gcc-4.3.4.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.3.4.inc +1
-1-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 \recipes/gcc/gcc-4.4.1.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.4.1.inc +1
-1-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 \recipes/gcc/gcc-4.4.2.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.4.2.inc +1
-1-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 \recipes/gcc/gcc-4.4.4.inc +0
-0@@ -8,7 +8,7 @@ LICENSE = "GPLv3"DEPENDS = "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"recipes/gcc/gcc-4.4.4.inc +1
-1-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 \recipes/gcc/gcc-4.5.inc +0
-0@@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf"NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
recipes/gcc/gcc-4.5.inc +1
-1-INC_PR = "r8" +INC_PR = "r9"SRCREV = "163322"
PV = "4.5"recipes/gcc/gcc-package-cross.inc +0
-0@@ -2,6 +2,8 @@ PACKAGE_STRIP ?= ""OLD_PACKAGE_STRIP := "${PACKAGE_STRIP}"
PACKAGE_STRIP = "no"recipes/gcc/gcc-package-cross.inc +2
-0+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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
-Khem