[PATCH 0/1] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[PATCH 0/1] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[Tom Rini]

As part of my looking into RPATH QA errors I noticed that we pass it
in _everywhere_ on non-libtool 2.4 distributions and looked around
a little.  I noticed that poky had dropped this change long ago on
the grounds that it's not needed with gcc & company obeying --sysroot
(rather than libtool).  This doesn't appear to have had the giant
fixing of RPATH issues that I had hoped for (but I can spot check if
people ask).  This change was tested in the trini/simplify-target-flags
branch and over the weekend I got the following results:
http://dl.dropbox.com/u/3284539/feb18matrix_withsimplifyflags.pdf

I've spot-checked the failures and the only unexpected to me ones are
related to hitting the bitbake cache unexpectedly locked bug and the gvfs
glib-2.0 version conflict.

[PATCH] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[Tom Rini]

This is based on poky's ba2e1f4d933c37b372d6749d64614f2510ee9d7b, which
simplifies TARGET_CPPFLAGS (and thus CFLAGS) and TARGET_LDFLAGS
based on gcc any company having --sysroot

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f005658..ec20332 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -502,7 +502,7 @@ PATCHRESOLVE = 'noop'
 
 export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
+export TARGET_CPPFLAGS = ""
 export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${includedir} -isystem${STAGING_DIR_HOST}${includedir}"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
@@ -520,7 +520,7 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
 
 export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = '${@["-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} -Wl,-O1 ${TARGET_LINK_HASH_STYLE}", "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]}'
+export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
 
 export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \
                          -Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \
-- 
1.7.0.4

Re: [PATCH] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[Khem Raj]

On Mon, Feb 21, 2011 at 5:14 PM, Tom Rini <tom_rini@mentor.com> wrote:
> This is based on poky's ba2e1f4d933c37b372d6749d64614f2510ee9d7b, which
> simplifies TARGET_CPPFLAGS (and thus CFLAGS) and TARGET_LDFLAGS
> based on gcc any company having --sysroot
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>

Acked-by:Khem Raj <raj.khem@gmail.com>
> ---
>  conf/bitbake.conf |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index f005658..ec20332 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -502,7 +502,7 @@ PATCHRESOLVE = 'noop'
>
>  export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
>  export CPPFLAGS = "${TARGET_CPPFLAGS}"
> -export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
> +export TARGET_CPPFLAGS = ""
>  export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${includedir} -isystem${STAGING_DIR_HOST}${includedir}"
>
>  export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
> @@ -520,7 +520,7 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
>                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
>
>  export LDFLAGS = "${TARGET_LDFLAGS}"
> -export TARGET_LDFLAGS = '${@["-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} -Wl,-O1 ${TARGET_LINK_HASH_STYLE}", "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]}'
> +export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
>
>  export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \
>                          -Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[Denys Dmytriyenko]

On Mon, Feb 21, 2011 at 10:21:12PM -0800, Khem Raj wrote:
> On Mon, Feb 21, 2011 at 5:14 PM, Tom Rini <tom_rini@mentor.com> wrote:
> > This is based on poky's ba2e1f4d933c37b372d6749d64614f2510ee9d7b, which
> > simplifies TARGET_CPPFLAGS (and thus CFLAGS) and TARGET_LDFLAGS
> > based on gcc any company having --sysroot
> >
> > Signed-off-by: Tom Rini <tom_rini@mentor.com>
> 
> Acked-by:Khem Raj <raj.khem@gmail.com>

Tom, Khem,

This change seems to break external-toolchains, e.g. CodeSourcery Lite, at 
least 2009q1 (gcc-4.3 based)...

I'm seeing issues like this in libxau:

| ./include/X11/Xauth.h:48:31: error: X11/Xfuncproto.h: No such file or directory
| ./include/X11/Xauth.h:49:27: error: X11/Xfuncs.h: No such file or directory

It cannot find standard X headers from OE sysroot.

Do I need to pass an extra --sysroot to CSL? Any other pointers?
Here's (hopefully useful) info from my toolchain:

$ arm-none-linux-gnueabi-gcc -print-sysroot
/opt/arm-2009q1/bin/../arm-none-linux-gnueabi/libc

$ arm-none-linux-gnueabi-gcc -print-search-dirs
install: /opt/arm-2009q1/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/
programs: =/opt/arm-2009q1/bin/../libexec/gcc/arm-none-linux-gnueabi/4.3.3/:/opt/arm-2009q1/bin/../libexec/gcc/:/opt/arm-2009q1/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/../../../../arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi/4.3.3/:/opt/arm-2009q1/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/../../../../arm-none-linux-gnueabi/bin/
libraries: =/opt/arm-2009q1/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/:/opt/arm-2009q1/bin/../lib/gcc/:/opt/arm-2009q1/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/../../../../arm-none-linux-gnueabi/lib/arm-none-linux-gnueabi/4.3.3/:/opt/arm-2009q1/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/../../../../arm-none-linux-gnueabi/lib/:/opt/arm-2009q1/bin/../arm-none-linux-gnueabi/libc/lib/arm-none-linux-gnueabi/4.3.3/:/opt/arm-2009q1/bin/../arm-none-linux-gnueabi/libc/lib/:/opt/arm-2009q1/bin/../arm-none-linux-gnueabi/libc/usr/lib/arm-none-linux-gnueabi/4.3.3/:/opt/arm-2009q1/bin/../arm-none-linux-gnueabi/libc/usr/lib/

-- 
Denys


> > ---
> >  conf/bitbake.conf |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> > index f005658..ec20332 100644
> > --- a/conf/bitbake.conf
> > +++ b/conf/bitbake.conf
> > @@ -502,7 +502,7 @@ PATCHRESOLVE = 'noop'
> >
> >  export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
> >  export CPPFLAGS = "${TARGET_CPPFLAGS}"
> > -export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
> > +export TARGET_CPPFLAGS = ""
> >  export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${includedir} -isystem${STAGING_DIR_HOST}${includedir}"
> >
> >  export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
> > @@ -520,7 +520,7 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
> >                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
> >
> >  export LDFLAGS = "${TARGET_LDFLAGS}"
> > -export TARGET_LDFLAGS = '${@["-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} -Wl,-O1 ${TARGET_LINK_HASH_STYLE}", "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]}'
> > +export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
> >
> >  export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \
> >                          -Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \
> > --
> > 1.7.0.4
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> >
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[Tom Rini]

On 02/23/2011 09:37 PM, Denys Dmytriyenko wrote:
> On Mon, Feb 21, 2011 at 10:21:12PM -0800, Khem Raj wrote:
>> On Mon, Feb 21, 2011 at 5:14 PM, Tom Rini<tom_rini@mentor.com>  wrote:
>>> This is based on poky's ba2e1f4d933c37b372d6749d64614f2510ee9d7b, which
>>> simplifies TARGET_CPPFLAGS (and thus CFLAGS) and TARGET_LDFLAGS
>>> based on gcc any company having --sysroot
>>>
>>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>>
>> Acked-by:Khem Raj<raj.khem@gmail.com>
>
> Tom, Khem,
>
> This change seems to break external-toolchains, e.g. CodeSourcery Lite, at
> least 2009q1 (gcc-4.3 based)...
>
> I'm seeing issues like this in libxau:
>
> | ./include/X11/Xauth.h:48:31: error: X11/Xfuncproto.h: No such file or directory
> | ./include/X11/Xauth.h:49:27: error: X11/Xfuncs.h: No such file or directory
>
> It cannot find standard X headers from OE sysroot.
>
> Do I need to pass an extra --sysroot to CSL? Any other pointers?

I've never not had to set:
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"

And then clear it on native/etc.  What's going on is that the CSL 
toolchain (and any other) was only finding stuff since we were spelling 
out where to look, and now we need to pass that information in again.

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH] bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[Tom Rini]

On 02/24/2011 08:57 AM, Tom Rini wrote:
> On 02/23/2011 09:37 PM, Denys Dmytriyenko wrote:
>> On Mon, Feb 21, 2011 at 10:21:12PM -0800, Khem Raj wrote:
>>> On Mon, Feb 21, 2011 at 5:14 PM, Tom Rini<tom_rini@mentor.com> wrote:
>>>> This is based on poky's ba2e1f4d933c37b372d6749d64614f2510ee9d7b, which
>>>> simplifies TARGET_CPPFLAGS (and thus CFLAGS) and TARGET_LDFLAGS
>>>> based on gcc any company having --sysroot
>>>>
>>>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>>>
>>> Acked-by:Khem Raj<raj.khem@gmail.com>
>>
>> Tom, Khem,
>>
>> This change seems to break external-toolchains, e.g. CodeSourcery
>> Lite, at
>> least 2009q1 (gcc-4.3 based)...
>>
>> I'm seeing issues like this in libxau:
>>
>> | ./include/X11/Xauth.h:48:31: error: X11/Xfuncproto.h: No such file
>> or directory
>> | ./include/X11/Xauth.h:49:27: error: X11/Xfuncs.h: No such file or
>> directory
>>
>> It cannot find standard X headers from OE sysroot.
>>
>> Do I need to pass an extra --sysroot to CSL? Any other pointers?
>
> I've never not had to set:
> TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
>
> And then clear it on native/etc. What's going on is that the CSL
> toolchain (and any other) was only finding stuff since we were spelling
> out where to look, and now we need to pass that information in again.

FWIW, poky has this already.

-- 
Tom Rini
Mentor Graphics Corporation

[PATCH 1/3] bitbake.conf, native*.bbclass: pass --sysroot to TOOLCHAIN_OPTIONS

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Commit 9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc (bitbake.conf: Simplify
TARGET_CPPFLAGS/LDFLAGS) potentially breaks external toolchains, when their
default sysroot is different from our sysroot/staging location.

Pass default --sysroot to compiler/linker through TOOLCHAIN_OPTIONS, avoiding
native and nativesdk packages. This matches the corresponding changes in Poky.
cross.bbclass was already doing it, since it originated from Poky, AFAIK.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 classes/native.bbclass    |    2 ++
 classes/nativesdk.bbclass |    2 ++
 conf/bitbake.conf         |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/classes/native.bbclass b/classes/native.bbclass
index 000ad61..b8a792f 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -37,6 +37,8 @@ CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 
+TOOLCHAIN_OPTIONS = ""
+
 STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass
index 6f21534..6689399 100644
--- a/classes/nativesdk.bbclass
+++ b/classes/nativesdk.bbclass
@@ -36,6 +36,8 @@ CFLAGS = "${BUILDSDK_CFLAGS}"
 CXXFLAGS = "${BUILDSDK_CFLAGS}"
 LDFLAGS = "${BUILDSDK_LDFLAGS}"
 
+TOOLCHAIN_OPTIONS = ""
+
 # Change to place files in SDKPATH
 prefix = "${SDKPATH}"
 exec_prefix = "${SDKPATH}"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 34f7726..1002c01 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -460,7 +460,7 @@ export PATH
 ##################################################################
 
 CCACHE ?= ""
-TOOLCHAIN_OPTIONS = ""
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
 TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}"
 TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"
 
-- 
1.7.0.4

[PATCH 2/3] ffmpeg: pass --sysroot to configure script directly

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

ffmpeg's custom configure script fails some checks for specific headers, even
though we pass --sysroot through CFLAGS. Use configure's specific --sysroot
option to fix that.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes/ffmpeg/ffmpeg_0.5.bb   |    3 ++-
 recipes/ffmpeg/ffmpeg_0.6.1.bb |    3 ++-
 recipes/ffmpeg/ffmpeg_git.bb   |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index f3a6d21..623c369 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -2,7 +2,7 @@ require ffmpeg.inc
 
 DEPENDS += "schroedinger libgsm"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 DEFAULT_PREFERENCE = "1"
 
@@ -47,6 +47,7 @@ EXTRA_OECONF = " \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
         --enable-hardcoded-tables \
         ${EXTRA_FFCONF} \
 "
diff --git a/recipes/ffmpeg/ffmpeg_0.6.1.bb b/recipes/ffmpeg/ffmpeg_0.6.1.bb
index fb941a5..74a1161 100644
--- a/recipes/ffmpeg/ffmpeg_0.6.1.bb
+++ b/recipes/ffmpeg/ffmpeg_0.6.1.bb
@@ -2,7 +2,7 @@ require ffmpeg.inc
 
 LICENSE = "LGPLv2.1+"
 DEPENDS += "schroedinger libgsm"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
 SRC_URI[md5sum] = "4f5d732d25eedfb072251b5314ba2093"
@@ -26,6 +26,7 @@ EXTRA_OECONF = " \
         --enable-swscale \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
         --prefix=${prefix}/ \
         --target-os=linux \
         ${EXTRA_FFCONF} \
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index 27e88ea..24c81ea 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "virtual/libsdl schroedinger libgsm libvpx"
 SRCREV = "a4f5af13fb00d7f55946470bb0f52e1dbf5f3c6a"
 
 PV = "0.6.1+${PR}+gitr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
@@ -47,6 +47,7 @@ EXTRA_OECONF = " \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
         --enable-hardcoded-tables \
         ${EXTRA_FFCONF} \
 "
-- 
1.7.0.4

[PATCH 3/3] gst-ffmpeg: remove 4-year old hack that sets CC directly

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

The hack that sets CC variable directly is 4 year old and no longer required.
On the other hand, it now breaks setups when --sysroot needs to be passed to
the toolchain. Hence, remove the hack.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes/gstreamer/gst-ffmpeg_0.10.11.bb |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
index 3a6533a..563521e 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
@@ -5,6 +5,8 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
 
+PR = "r1"
+
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
@@ -23,7 +25,3 @@ EXTRA_OECONF = " --with-system-ffmpeg "
 # We do this because the install program is called with -s which causes it to
 # call "strip" and it then mangles cross compiled stuff..
 PATH_prepend := "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
-
-# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
-CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
-
-- 
1.7.0.4

Re: [PATCH 1/3] bitbake.conf, native*.bbclass: pass --sysroot to TOOLCHAIN_OPTIONS

[Tom Rini]

On 02/24/2011 04:39 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko<denys@ti.com>
>
> Commit 9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc (bitbake.conf: Simplify
> TARGET_CPPFLAGS/LDFLAGS) potentially breaks external toolchains, when their
> default sysroot is different from our sysroot/staging location.
>
> Pass default --sysroot to compiler/linker through TOOLCHAIN_OPTIONS, avoiding
> native and nativesdk packages. This matches the corresponding changes in Poky.
> cross.bbclass was already doing it, since it originated from Poky, AFAIK.
>
> Signed-off-by: Denys Dmytriyenko<denys@ti.com>

Acked-by: Tom Rini <tom_rini@mentor.com>

> ---
>   classes/native.bbclass    |    2 ++
>   classes/nativesdk.bbclass |    2 ++
>   conf/bitbake.conf         |    2 +-
>   3 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/classes/native.bbclass b/classes/native.bbclass
> index 000ad61..b8a792f 100644
> --- a/classes/native.bbclass
> +++ b/classes/native.bbclass
> @@ -37,6 +37,8 @@ CXXFLAGS = "${BUILD_CFLAGS}"
>   LDFLAGS = "${BUILD_LDFLAGS}"
>   LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
>
> +TOOLCHAIN_OPTIONS = ""
> +
>   STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
>   STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
>
> diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass
> index 6f21534..6689399 100644
> --- a/classes/nativesdk.bbclass
> +++ b/classes/nativesdk.bbclass
> @@ -36,6 +36,8 @@ CFLAGS = "${BUILDSDK_CFLAGS}"
>   CXXFLAGS = "${BUILDSDK_CFLAGS}"
>   LDFLAGS = "${BUILDSDK_LDFLAGS}"
>
> +TOOLCHAIN_OPTIONS = ""
> +
>   # Change to place files in SDKPATH
>   prefix = "${SDKPATH}"
>   exec_prefix = "${SDKPATH}"
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index 34f7726..1002c01 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -460,7 +460,7 @@ export PATH
>   ##################################################################
>
>   CCACHE ?= ""
> -TOOLCHAIN_OPTIONS = ""
> +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
>   TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}"
>   TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"
>


-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 2/3] ffmpeg: pass --sysroot to configure script directly

[Tom Rini]

On 02/24/2011 04:39 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko<denys@ti.com>
>
> ffmpeg's custom configure script fails some checks for specific headers, even
> though we pass --sysroot through CFLAGS. Use configure's specific --sysroot
> option to fix that.
>
> Signed-off-by: Denys Dmytriyenko<denys@ti.com>

Acked-by: Tom Rini <tom_rini@mentor.com>

> ---
>   recipes/ffmpeg/ffmpeg_0.5.bb   |    3 ++-
>   recipes/ffmpeg/ffmpeg_0.6.1.bb |    3 ++-
>   recipes/ffmpeg/ffmpeg_git.bb   |    3 ++-
>   3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
> index f3a6d21..623c369 100644
> --- a/recipes/ffmpeg/ffmpeg_0.5.bb
> +++ b/recipes/ffmpeg/ffmpeg_0.5.bb
> @@ -2,7 +2,7 @@ require ffmpeg.inc
>
>   DEPENDS += "schroedinger libgsm"
>
> -PR = "${INC_PR}.1"
> +PR = "${INC_PR}.2"
>
>   DEFAULT_PREFERENCE = "1"
>
> @@ -47,6 +47,7 @@ EXTRA_OECONF = " \
>           --enable-cross-compile \
>           --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
>           --extra-ldflags="${TARGET_LDFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
> +        --sysroot="${STAGING_DIR_TARGET}" \
>           --enable-hardcoded-tables \
>           ${EXTRA_FFCONF} \
>   "
> diff --git a/recipes/ffmpeg/ffmpeg_0.6.1.bb b/recipes/ffmpeg/ffmpeg_0.6.1.bb
> index fb941a5..74a1161 100644
> --- a/recipes/ffmpeg/ffmpeg_0.6.1.bb
> +++ b/recipes/ffmpeg/ffmpeg_0.6.1.bb
> @@ -2,7 +2,7 @@ require ffmpeg.inc
>
>   LICENSE = "LGPLv2.1+"
>   DEPENDS += "schroedinger libgsm"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>
>   SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
>   SRC_URI[md5sum] = "4f5d732d25eedfb072251b5314ba2093"
> @@ -26,6 +26,7 @@ EXTRA_OECONF = " \
>           --enable-swscale \
>           --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
>           --extra-ldflags="${TARGET_LDFLAGS}" \
> +        --sysroot="${STAGING_DIR_TARGET}" \
>           --prefix=${prefix}/ \
>           --target-os=linux \
>           ${EXTRA_FFCONF} \
> diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
> index 27e88ea..24c81ea 100644
> --- a/recipes/ffmpeg/ffmpeg_git.bb
> +++ b/recipes/ffmpeg/ffmpeg_git.bb
> @@ -6,7 +6,7 @@ DEPENDS += "virtual/libsdl schroedinger libgsm libvpx"
>   SRCREV = "a4f5af13fb00d7f55946470bb0f52e1dbf5f3c6a"
>
>   PV = "0.6.1+${PR}+gitr${SRCPV}"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>
>   DEFAULT_PREFERENCE = "-1"
>   DEFAULT_PREFERENCE_angstrom = "1"
> @@ -47,6 +47,7 @@ EXTRA_OECONF = " \
>           --enable-cross-compile \
>           --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
>           --extra-ldflags="${TARGET_LDFLAGS}" \
> +        --sysroot="${STAGING_DIR_TARGET}" \
>           --enable-hardcoded-tables \
>           ${EXTRA_FFCONF} \
>   "


-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 3/3] gst-ffmpeg: remove 4-year old hack that sets CC directly

[Tom Rini]

On 02/24/2011 04:39 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko<denys@ti.com>
>
> The hack that sets CC variable directly is 4 year old and no longer required.
> On the other hand, it now breaks setups when --sysroot needs to be passed to
> the toolchain. Hence, remove the hack.
>
> Signed-off-by: Denys Dmytriyenko<denys@ti.com>

Acked-by: Tom Rini <tom_rini@mentor.com>

> ---
>   recipes/gstreamer/gst-ffmpeg_0.10.11.bb |    6 ++----
>   1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
> index 3a6533a..563521e 100644
> --- a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
> +++ b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
> @@ -5,6 +5,8 @@ LICENSE = "LGPL"
>   HOMEPAGE = "http://www.gstreamer.net/"
>   DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
>
> +PR = "r1"
> +
>   inherit autotools pkgconfig
>
>   SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
> @@ -23,7 +25,3 @@ EXTRA_OECONF = " --with-system-ffmpeg "
>   # We do this because the install program is called with -s which causes it to
>   # call "strip" and it then mangles cross compiled stuff..
>   PATH_prepend := "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
> -
> -# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
> -CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
> -


-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 3/3] gst-ffmpeg: remove 4-year old hack that sets CC directly

[Koen Kooi]

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

On 25-02-11 00:39, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> The hack that sets CC variable directly is 4 year old and no longer required.
> On the other hand, it now breaks setups when --sysroot needs to be passed to
> the toolchain. Hence, remove the hack.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

Acked-by: Koen Kooi <koen@opembedded.org>


> ---
>  recipes/gstreamer/gst-ffmpeg_0.10.11.bb |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
> index 3a6533a..563521e 100644
> --- a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
> +++ b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb
> @@ -5,6 +5,8 @@ LICENSE = "LGPL"
>  HOMEPAGE = "http://www.gstreamer.net/"
>  DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
>  
> +PR = "r1"
> +
>  inherit autotools pkgconfig
>  
>  SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
> @@ -23,7 +25,3 @@ EXTRA_OECONF = " --with-system-ffmpeg "
>  # We do this because the install program is called with -s which causes it to
>  # call "strip" and it then mangles cross compiled stuff..
>  PATH_prepend := "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
> -
> -# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
> -CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
> -

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNZ3XUMkyGM64RGpERAkC7AJ9/AQNel/Bukfi6mN3pkcBWLIcOYQCeND3A
OBS/tzWO5+bNmprpCd0WppU=
=GE2x
-----END PGP SIGNATURE-----