[oe] [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.

[Paul Menzel]

Am Freitag, den 05.11.2010, 14:19 +0100 schrieb Frans Meulenbroeks:
> 2010/11/5 Paul Menzel <paulepanter at users.sourceforge.net>:
> > Am Freitag, den 05.11.2010, 13:08 +0100 schrieb Frans Meulenbroeks:
> >> 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.
> >
> > Please add a link to this commit message and the patch headers pointing
> > to the upstream commit, list message or ticket.
> >
> >> Patch is tested by fully building 1.3.2 and by running
> >> bitbake -c patch for the other recipes.
> >>
> >> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
> >>
> >> a---
> >>  .../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
> >
> > It looks like these three patches are exactly the same. Would one file
> > in the version independent directory be enough?
> >
> > […]
> 
> They are exactly the same.
> I discussed this with Martin Jansa on irc, and we felt it would be
> best to submit the patch upstream.

I agree.

> Then if it is in the inc file, it needs to be taken out again when the
> next version comes.

Sorry, I did not make myself clear. My point was if you could put
`configure.ac-nios2.patch` into `libX11/` or `files`.

> Hence it was put in the individual files.
> 
> BTW it looks like upstream might go for a slightly different patch.
> I'll leave it to Martin to decide whether to go for that one or for
> this one (he is on cc of the upstream correspondence).

Again, could you provide a link to that discussion.

> I'll be afk next week so can't give followup on this.

Understood. Thank you for your fast reply.


Thanks,

Paul
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20101105/23aa9914/attachment-0002.sig>