On Fri, Nov 5, 2010 at 5:08 AM, Frans Meulenbroeks <[email protected]> wrote: > configure.ac matches target_system against *os2* to detect if we're > configuring for an os2 system. Unfortunately this also matches if the > target_system is nios-linux (which is not an os2 system :-) ) > This patch adds an additional case. The patch is added to the individual > recipes and also made upstream. > > Patch is tested by fully building 1.3.2 and by running > bitbake -c patch for the other recipes. > > Signed-off-by: Frans Meulenbroeks <[email protected]>
Hmmm good find. I am ok with general fix. but please consider other review comments before you commit Acked-by: Khem Raj <[email protected]> > --- > .../xorg-lib/libx11-1.1.5/configure.ac-nios2.patch | 12 ++++++++++++ > .../xorg-lib/libx11-1.3.2/configure.ac-nios2.patch | 12 ++++++++++++ > .../xorg-lib/libx11-1.3.6/configure.ac-nios2.patch | 12 ++++++++++++ > .../libx11-1.3.99.903/configure.ac-nios2.patch | 12 ++++++++++++ > recipes/xorg-lib/libx11_1.1.5.bb | 3 ++- > recipes/xorg-lib/libx11_1.3.2.bb | 3 ++- > recipes/xorg-lib/libx11_1.3.6.bb | 3 ++- > recipes/xorg-lib/libx11_1.3.99.903.bb | 3 ++- > 8 files changed, 56 insertions(+), 4 deletions(-) > create mode 100644 recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch > create mode 100644 recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch > create mode 100644 recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch > create mode 100644 > recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch > > diff --git a/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch > b/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch > new file mode 100644 > index 0000000..5605a59 > --- /dev/null > +++ b/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch > @@ -0,0 +1,12 @@ > +Index: libX11-1.3.2/configure.ac > +=================================================================== > +--- libX11-1.3.2.orig/configure.ac 2010-11-05 10:30:33.825536983 +0100 > ++++ libX11-1.3.2/configure.ac 2010-11-05 10:31:25.913899269 +0100 > +@@ -202,6 +202,7 @@ > + # arch specific things > + WCHAR32="1" > + case $target_alias in > ++ nios2*) os2="false" ;; > + *os2*) os2="true" ; WCHAR32="0" ;; > + *) ;; > + esac > diff --git a/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch > b/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch > new file mode 100644 > index 0000000..5605a59 > --- /dev/null > +++ b/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch > @@ -0,0 +1,12 @@ > +Index: libX11-1.3.2/configure.ac > +=================================================================== > +--- libX11-1.3.2.orig/configure.ac 2010-11-05 10:30:33.825536983 +0100 > ++++ libX11-1.3.2/configure.ac 2010-11-05 10:31:25.913899269 +0100 > +@@ -202,6 +202,7 @@ > + # arch specific things > + WCHAR32="1" > + case $target_alias in > ++ nios2*) os2="false" ;; > + *os2*) os2="true" ; WCHAR32="0" ;; > + *) ;; > + esac > diff --git a/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch > b/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch > new file mode 100644 > index 0000000..5605a59 > --- /dev/null > +++ b/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch > @@ -0,0 +1,12 @@ > +Index: libX11-1.3.2/configure.ac > +=================================================================== > +--- libX11-1.3.2.orig/configure.ac 2010-11-05 10:30:33.825536983 +0100 > ++++ libX11-1.3.2/configure.ac 2010-11-05 10:31:25.913899269 +0100 > +@@ -202,6 +202,7 @@ > + # arch specific things > + WCHAR32="1" > + case $target_alias in > ++ nios2*) os2="false" ;; > + *os2*) os2="true" ; WCHAR32="0" ;; > + *) ;; > + esac > diff --git a/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch > b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch > new file mode 100644 > index 0000000..5605a59 > --- /dev/null > +++ b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch > @@ -0,0 +1,12 @@ > +Index: libX11-1.3.2/configure.ac > +=================================================================== > +--- libX11-1.3.2.orig/configure.ac 2010-11-05 10:30:33.825536983 +0100 > ++++ libX11-1.3.2/configure.ac 2010-11-05 10:31:25.913899269 +0100 > +@@ -202,6 +202,7 @@ > + # arch specific things > + WCHAR32="1" > + case $target_alias in > ++ nios2*) os2="false" ;; > + *os2*) os2="true" ; WCHAR32="0" ;; > + *) ;; > + esac > diff --git a/recipes/xorg-lib/libx11_1.1.5.bb > b/recipes/xorg-lib/libx11_1.1.5.bb > index e775585..b44dcc8 100644 > --- a/recipes/xorg-lib/libx11_1.1.5.bb > +++ b/recipes/xorg-lib/libx11_1.1.5.bb > @@ -1,7 +1,8 @@ > require libx11.inc > DEPENDS = "${COMMON_DEPENDS}" > -PR = "${INC_PR}.1" > +PR = "${INC_PR}.2" > > +SRC_URI += " file://configure.ac-nios2.patch" > SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8" > SRC_URI[archive.sha256sum] = > "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82" > > diff --git a/recipes/xorg-lib/libx11_1.3.2.bb > b/recipes/xorg-lib/libx11_1.3.2.bb > index b3d48ab..189d1ff 100644 > --- a/recipes/xorg-lib/libx11_1.3.2.bb > +++ b/recipes/xorg-lib/libx11_1.3.2.bb > @@ -1,10 +1,11 @@ > require libx11.inc > -PR = "${INC_PR}.2" > +PR = "${INC_PR}.3" > # gcc 4.5 ends up ICEing with thumb and -O1 with -fno-omit-framepointer > # therefore if we are in thumb mode then we use -Os instead of -O1 for > # DEBUG_OPTIMIZATION > > DEBUG_OPTIMIZATION_thumb_append = " -Os" > SRC_URI += " file://dolt-fix.patch" > +SRC_URI += " file://configure.ac-nios2.patch" > SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd" > SRC_URI[archive.sha256sum] = > "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2" > diff --git a/recipes/xorg-lib/libx11_1.3.6.bb > b/recipes/xorg-lib/libx11_1.3.6.bb > index 625f906..8d9f343 100644 > --- a/recipes/xorg-lib/libx11_1.3.6.bb > +++ b/recipes/xorg-lib/libx11_1.3.6.bb > @@ -1,6 +1,7 @@ > require libx11.inc > -PR = "${INC_PR}.0" > +PR = "${INC_PR}.1" > > SRC_URI += " file://dolt-fix.patch" > +SRC_URI += " file://configure.ac-nios2.patch" > SRC_URI[archive.md5sum] = "8e0a8a466aa78f66e09fe06cb395319f" > SRC_URI[archive.sha256sum] = > "599826765c59a98b1e58b4f6c4ad50dca69eeb0e7bd78aea736ca815f45bea40" > diff --git a/recipes/xorg-lib/libx11_1.3.99.903.bb > b/recipes/xorg-lib/libx11_1.3.99.903.bb > index 65ff63c..5ea3291 100644 > --- a/recipes/xorg-lib/libx11_1.3.99.903.bb > +++ b/recipes/xorg-lib/libx11_1.3.99.903.bb > @@ -2,7 +2,8 @@ require libx11.inc > #--without-xcb is not an option anymore > #http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8 > DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}" > -PR = "${INC_PR}.0" > +PR = "${INC_PR}.1" > > +SRC_URI += " file://configure.ac-nios2.patch" > SRC_URI[archive.md5sum] = "3e8ed7a91f70bb819b5dab9c124a7062" > SRC_URI[archive.sha256sum] = > "50205aad0646c0ab13aff8e8eaec7c5cddff416d3a012f83c5661ad98e49736f" > -- > 1.7.0.4 > > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
