From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay1.mentorg.com ([192.94.38.131]) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1PFqGd-0002CI-Kn for openembedded-devel@lists.openembedded.org; Tue, 09 Nov 2010 16:37:53 +0100 Received: from svr-orw-exc-08.mgc.mentorg.com ([147.34.98.97]) by relay1.mentorg.com with esmtp id 1PFqFg-0003Ep-O5 from Tom_Rini@mentor.com for openembedded-devel@lists.openembedded.org; Tue, 09 Nov 2010 07:36:52 -0800 Received: from na2-mail.mgc.mentorg.com ([134.86.114.213]) by SVR-ORW-EXC-08.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 9 Nov 2010 07:36:52 -0800 Received: from [172.30.80.200] ([172.30.80.200]) by na2-mail.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 9 Nov 2010 08:36:51 -0700 Message-ID: <4CD96A90.7020100@mentor.com> Date: Tue, 09 Nov 2010 08:36:48 -0700 From: Tom Rini Organization: Mentor Graphics Corporation User-Agent: Thunderbird 2.0.0.24 (X11/20101027) MIME-Version: 1.0 To: openembedded-devel@lists.openembedded.org References: <1289281330-6928-1-git-send-email-raj.khem@gmail.com> In-Reply-To: <1289281330-6928-1-git-send-email-raj.khem@gmail.com> X-OriginalArrivalTime: 09 Nov 2010 15:36:51.0738 (UTC) FILETIME=[EE1E87A0:01CB8023] X-SA-Exim-Connect-IP: 192.94.38.131 X-SA-Exim-Mail-From: Tom_Rini@mentor.com X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on discovery X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:20:07 +0000) X-SA-Exim-Scanned: Yes (on linuxtogo.org) Subject: Re: [PATCH] gcc-configure-common.inc: sed /usr/include hardcodes paths to use target_includedir X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2010 15:37:53 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Khem Raj wrote: > This fixes the problem where gcc fails to detect presence of libssp > and does not detect powerpc long double 128 bit support correctly on systems which do > not use common /usr/include paths like we have in micro distro > > Signed-off-by: Khem Raj Acked-by: Tom Rini > --- > 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-configure-common.inc | 9 ++++++++- > 16 files changed, 23 insertions(+), 16 deletions(-) > > diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc > index 8da06aa..3df9976 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 = "r13" > +INC_PR = "r14" > > DEFAULT_PREFERENCE = "-1" > > diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc > index c261138..ed6fc47 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 = "r4" > +INC_PR = "r5" > > 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 114f053..7c699e1 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 = "r25" > +INC_PR = "r26" > > 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 e5506c7..99644bd 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 = "r23" > +INC_PR = "r24" > > 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 a1f9cd3..bf31f78 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 = "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.3.inc b/recipes/gcc/gcc-4.2.3.inc > index 988740e..267bc5d 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 = "r20" > +INC_PR = "r21" > > 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 974471e..97e1ddb 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 = "r14" > +INC_PR = "r15" > > 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 7829f23..19c0431 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 = "r24" > +INC_PR = "r25" > > 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 aa9cd48..1091511 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 = "r14" > +INC_PR = "r15" > > 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 7239f82..58dd501 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 = "r19" > +INC_PR = "r20" > > 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 3f3809c..b582f72 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 = "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.4.1.inc b/recipes/gcc/gcc-4.4.1.inc > index acb5371..b2204ba 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 = "r11" > +INC_PR = "r12" > > 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 42e8d54..469d407 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 = "r5" > +INC_PR = "r6" > > 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 1bc7c12..acee192 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 = "r6" > +INC_PR = "r7" > > 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 910be9c..c6a78ce 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 = "r18" > +INC_PR = "r19" > > SRCREV = "166342" > PV = "4.5" > diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc > index fe0d32d..4d8edbc 100644 > --- a/recipes/gcc/gcc-configure-common.inc > +++ b/recipes/gcc/gcc-configure-common.inc > @@ -93,7 +93,14 @@ do_configure () { > sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl > > (cd ${S} && gnu-configize) || die "failure running gnu-configize" > - > + # gcc assumes ${sysroot}/usr to be prefix on linux targets > + # but we have distro option to flatten out the tree and micro > + # uses root file system without leading /usr so we need to > + # teach gcc configure to look in correct include paths > + # unfortunately there is no configure knob to indicate this > + # to configury hence the sed :( > + sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure.ac > + sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure > if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then > # splice our idea of where the headers live into gcc's world > echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe -- Tom Rini Mentor Graphics Corporation