All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
@ 2010-11-05 12:08 Frans Meulenbroeks
  2010-11-05 12:51 ` Paul Menzel
  2010-11-05 15:36 ` Khem Raj
  0 siblings, 2 replies; 9+ messages in thread
From: Frans Meulenbroeks @ 2010-11-05 12:08 UTC (permalink / raw)
  To: openembedded-devel

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 <fransmeulenbroeks@gmail.com>
---
 .../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




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 12:08 [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system Frans Meulenbroeks
@ 2010-11-05 12:51 ` Paul Menzel
  2010-11-05 13:19   ` Frans Meulenbroeks
  2010-11-05 15:36 ` Khem Raj
  1 sibling, 1 reply; 9+ messages in thread
From: Paul Menzel @ 2010-11-05 12:51 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 2591 bytes --]

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@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?

[…]

Otherwise

Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 12:51 ` Paul Menzel
@ 2010-11-05 13:19   ` Frans Meulenbroeks
  2010-11-05 13:26     ` Paul Menzel
  0 siblings, 1 reply; 9+ messages in thread
From: Frans Meulenbroeks @ 2010-11-05 13:19 UTC (permalink / raw)
  To: openembedded-devel

2010/11/5 Paul Menzel <paulepanter@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@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.
Then if it is in the inc file, it needs to be taken out again when the
next version comes.
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).
I'll be afk next week so can't give followup on this.

Frans



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 13:19   ` Frans Meulenbroeks
@ 2010-11-05 13:26     ` Paul Menzel
  2010-11-05 13:35       ` Frans Meulenbroeks
  2010-11-05 13:38       ` Martin Jansa
  0 siblings, 2 replies; 9+ messages in thread
From: Paul Menzel @ 2010-11-05 13:26 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 3605 bytes --]

Am Freitag, den 05.11.2010, 14:19 +0100 schrieb Frans Meulenbroeks:
> 2010/11/5 Paul Menzel <paulepanter@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@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

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 13:26     ` Paul Menzel
@ 2010-11-05 13:35       ` Frans Meulenbroeks
  2010-11-05 13:38       ` Martin Jansa
  1 sibling, 0 replies; 9+ messages in thread
From: Frans Meulenbroeks @ 2010-11-05 13:35 UTC (permalink / raw)
  To: openembedded-devel

2010/11/5 Paul Menzel <paulepanter@users.sourceforge.net>:
> Am Freitag, den 05.11.2010, 14:19 +0100 schrieb Frans Meulenbroeks:
>> 2010/11/5 Paul Menzel <paulepanter@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@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`.

Yes.
files is not too nice, libX11 is probably better
>
>> 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.

http://lists.freedesktop.org/archives/xorg/2010-November/051731.html

>
>> I'll be afk next week so can't give followup on this.
>
> Understood. Thank you for your fast reply.
>
You thanks for your review work!
It is not often said, but it is definitely appreciated.

Frans
>
> Thanks,
>
> Paul
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 13:26     ` Paul Menzel
  2010-11-05 13:35       ` Frans Meulenbroeks
@ 2010-11-05 13:38       ` Martin Jansa
  2010-11-05 13:57         ` Paul Menzel
  1 sibling, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2010-11-05 13:38 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Nov 05, 2010 at 02:26:48PM +0100, Paul Menzel wrote:
> 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`.

better not to use files at all
http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-October/025673.html

diet-x11_1.1.5.bb libx11-trim_1.1.5.bb will find it ok in libx11* dir,
because of FILESPATHPKG .= ":libx11-${PV}:libx11" in libx11.inc

but even when it's the same file I would keep it in separate dirs,
because newer versions won't need it (hopefully) and then it will be
removed with older versions.

> > 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.

http://lists.freedesktop.org/archives/xorg/2010-November/051731.html

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 13:38       ` Martin Jansa
@ 2010-11-05 13:57         ` Paul Menzel
  0 siblings, 0 replies; 9+ messages in thread
From: Paul Menzel @ 2010-11-05 13:57 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]

Am Freitag, den 05.11.2010, 14:38 +0100 schrieb Martin Jansa:
> On Fri, Nov 05, 2010 at 02:26:48PM +0100, Paul Menzel wrote:
> > 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`.
> 
> better not to use files at all
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-October/025673.html

Correct. I forgot.

> diet-x11_1.1.5.bb libx11-trim_1.1.5.bb will find it ok in libx11* dir,
> because of FILESPATHPKG .= ":libx11-${PV}:libx11" in libx11.inc
> 
> but even when it's the same file I would keep it in separate dirs,
> because newer versions won't need it (hopefully) and then it will be
> removed with older versions.

That is a valid argument. Although then patches should never be share
between versions unless there is no upstream development anymore?

It is fine either way by me. So do as you prefer.

> > > 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.
> 
> http://lists.freedesktop.org/archives/xorg/2010-November/051731.html


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 12:08 [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system Frans Meulenbroeks
  2010-11-05 12:51 ` Paul Menzel
@ 2010-11-05 15:36 ` Khem Raj
  2010-11-05 17:23   ` Frans Meulenbroeks
  1 sibling, 1 reply; 9+ messages in thread
From: Khem Raj @ 2010-11-05 15:36 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Nov 5, 2010 at 5:08 AM, Frans Meulenbroeks
<fransmeulenbroeks@gmail.com> 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 <fransmeulenbroeks@gmail.com>

Hmmm good find. I am ok with general fix. but please consider other
review comments before you commit

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>  .../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
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
  2010-11-05 15:36 ` Khem Raj
@ 2010-11-05 17:23   ` Frans Meulenbroeks
  0 siblings, 0 replies; 9+ messages in thread
From: Frans Meulenbroeks @ 2010-11-05 17:23 UTC (permalink / raw)
  To: openembedded-devel

2010/11/5 Khem Raj <raj.khem@gmail.com>:
> On Fri, Nov 5, 2010 at 5:08 AM, Frans Meulenbroeks
> <fransmeulenbroeks@gmail.com> 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 <fransmeulenbroeks@gmail.com>
>
> Hmmm good find. I am ok with general fix. but please consider other
> review comments before you commit
>
> Acked-by: Khem Raj <raj.khem@gmail.com>

I won't have time to commit next 10 days or so. I'll be mostly afk.
If desired Martin (being the X maintainer iirc, can commit).
And feel free to change the patch or the commit message (or maybe move
to the alternative suggested upstream).

Frans
>
>> ---
>>  .../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
>> 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
>



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2010-11-05 17:24 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-05 12:08 [PATCH] libX11: patch configure.ac so a nios2 system is not seen as an os2 system Frans Meulenbroeks
2010-11-05 12:51 ` Paul Menzel
2010-11-05 13:19   ` Frans Meulenbroeks
2010-11-05 13:26     ` Paul Menzel
2010-11-05 13:35       ` Frans Meulenbroeks
2010-11-05 13:38       ` Martin Jansa
2010-11-05 13:57         ` Paul Menzel
2010-11-05 15:36 ` Khem Raj
2010-11-05 17:23   ` Frans Meulenbroeks

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.