* [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
@ 2010-11-17 13:58 Frans Meulenbroeks
2010-11-17 14:04 ` Martin Jansa
2010-11-17 14:21 ` Walter Goossens
0 siblings, 2 replies; 4+ messages in thread
From: Frans Meulenbroeks @ 2010-11-17 13:58 UTC (permalink / raw)
To: openembedded-devel
The OS/2 platform requires some utility functions as well as having a non-32 bit wchar_t. Fix the configure check so that it doesn't also affect the nios2 cpu, which wouldn't influence these operating system issues.
This is already accepted upstream and will be in 1.4
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=affc2488a7f2660a74dc8354fc3e0bff2c4f879c
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
.../xorg-lib/libx11-1.1.5/configure.ac-nios2.patch | 33 ++++++++++++++++++++
.../xorg-lib/libx11-1.3.2/configure.ac-nios2.patch | 33 ++++++++++++++++++++
.../xorg-lib/libx11-1.3.6/configure.ac-nios2.patch | 33 ++++++++++++++++++++
.../libx11-1.3.99.903/configure.ac-nios2.patch | 33 ++++++++++++++++++++
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, 140 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..2e2d475
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+- *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++ os2*) os2="true" ; WCHAR32="0" ;;
+ *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
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..2e2d475
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+- *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++ os2*) os2="true" ; WCHAR32="0" ;;
+ *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
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..2e2d475
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+- *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++ os2*) os2="true" ; WCHAR32="0" ;;
+ *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
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..2e2d475
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch
@@ -0,0 +1,33 @@
+From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
+From: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sat, 06 Nov 2010 21:58:09 +0000
+Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
+
+The OS/2 platform requires some utility functions as well as having a
+non-32 bit wchar_t. Fix the configure check so that it doesn't also
+affect the nios2 cpu, which wouldn't influence these operating system
+issues.
+
+Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 1b4a8b7..01f43fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
+
+ # arch specific things
+ WCHAR32="1"
+-case $target_alias in
+- *os2*) os2="true" ; WCHAR32="0" ;;
++case $target_os in
++ os2*) os2="true" ; WCHAR32="0" ;;
+ *) ;;
+ esac
+ AC_SUBST(WCHAR32)
+--
+cgit v0.8.3-6-g21f6
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] 4+ messages in thread
* Re: [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
2010-11-17 13:58 [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system Frans Meulenbroeks
@ 2010-11-17 14:04 ` Martin Jansa
2010-11-17 14:21 ` Walter Goossens
1 sibling, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2010-11-17 14:04 UTC (permalink / raw)
To: openembedded-devel
On Wed, Nov 17, 2010 at 02:58:10PM +0100, Frans Meulenbroeks wrote:
> The OS/2 platform requires some utility functions as well as having a non-32 bit wchar_t. Fix the configure check so that it doesn't also affect the nios2 cpu, which wouldn't influence these operating system issues.
Looks good
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
2010-11-17 13:58 [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system Frans Meulenbroeks
2010-11-17 14:04 ` Martin Jansa
@ 2010-11-17 14:21 ` Walter Goossens
2010-11-17 15:08 ` Frans Meulenbroeks
1 sibling, 1 reply; 4+ messages in thread
From: Walter Goossens @ 2010-11-17 14:21 UTC (permalink / raw)
To: openembedded-devel
I just noticed my test build halted on that exact error...
I'll ack this one :)
On 11/17/10 2:58 PM, Frans Meulenbroeks wrote:
> The OS/2 platform requires some utility functions as well as having a non-32 bit wchar_t. Fix the configure check so that it doesn't also affect the nios2 cpu, which wouldn't influence these operating system issues.
>
> This is already accepted upstream and will be in 1.4
> http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=affc2488a7f2660a74dc8354fc3e0bff2c4f879c
>
> Signed-off-by: Frans Meulenbroeks<fransmeulenbroeks@gmail.com>
> ---
> .../xorg-lib/libx11-1.1.5/configure.ac-nios2.patch | 33 ++++++++++++++++++++
> .../xorg-lib/libx11-1.3.2/configure.ac-nios2.patch | 33 ++++++++++++++++++++
> .../xorg-lib/libx11-1.3.6/configure.ac-nios2.patch | 33 ++++++++++++++++++++
> .../libx11-1.3.99.903/configure.ac-nios2.patch | 33 ++++++++++++++++++++
> 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, 140 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..2e2d475
> --- /dev/null
> +++ b/recipes/xorg-lib/libx11-1.1.5/configure.ac-nios2.patch
> @@ -0,0 +1,33 @@
> +From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
> +From: Dan Nicholson<dbn.lists@gmail.com>
> +Date: Sat, 06 Nov 2010 21:58:09 +0000
> +Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
> +
> +The OS/2 platform requires some utility functions as well as having a
> +non-32 bit wchar_t. Fix the configure check so that it doesn't also
> +affect the nios2 cpu, which wouldn't influence these operating system
> +issues.
> +
> +Signed-off-by: Dan Nicholson<dbn.lists@gmail.com>
> +Tested-by: Frans Meulenbroeks<fransmeulenbroeks@gmail.com>
> +Reviewed-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +Reviewed-by: Julien Cristau<jcristau@debian.org>
> +Signed-off-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +---
> +diff --git a/configure.ac b/configure.ac
> +index 1b4a8b7..01f43fb 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
> +
> + # arch specific things
> + WCHAR32="1"
> +-case $target_alias in
> +- *os2*) os2="true" ; WCHAR32="0" ;;
> ++case $target_os in
> ++ os2*) os2="true" ; WCHAR32="0" ;;
> + *) ;;
> + esac
> + AC_SUBST(WCHAR32)
> +--
> +cgit v0.8.3-6-g21f6
> 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..2e2d475
> --- /dev/null
> +++ b/recipes/xorg-lib/libx11-1.3.2/configure.ac-nios2.patch
> @@ -0,0 +1,33 @@
> +From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
> +From: Dan Nicholson<dbn.lists@gmail.com>
> +Date: Sat, 06 Nov 2010 21:58:09 +0000
> +Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
> +
> +The OS/2 platform requires some utility functions as well as having a
> +non-32 bit wchar_t. Fix the configure check so that it doesn't also
> +affect the nios2 cpu, which wouldn't influence these operating system
> +issues.
> +
> +Signed-off-by: Dan Nicholson<dbn.lists@gmail.com>
> +Tested-by: Frans Meulenbroeks<fransmeulenbroeks@gmail.com>
> +Reviewed-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +Reviewed-by: Julien Cristau<jcristau@debian.org>
> +Signed-off-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +---
> +diff --git a/configure.ac b/configure.ac
> +index 1b4a8b7..01f43fb 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
> +
> + # arch specific things
> + WCHAR32="1"
> +-case $target_alias in
> +- *os2*) os2="true" ; WCHAR32="0" ;;
> ++case $target_os in
> ++ os2*) os2="true" ; WCHAR32="0" ;;
> + *) ;;
> + esac
> + AC_SUBST(WCHAR32)
> +--
> +cgit v0.8.3-6-g21f6
> 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..2e2d475
> --- /dev/null
> +++ b/recipes/xorg-lib/libx11-1.3.6/configure.ac-nios2.patch
> @@ -0,0 +1,33 @@
> +From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
> +From: Dan Nicholson<dbn.lists@gmail.com>
> +Date: Sat, 06 Nov 2010 21:58:09 +0000
> +Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
> +
> +The OS/2 platform requires some utility functions as well as having a
> +non-32 bit wchar_t. Fix the configure check so that it doesn't also
> +affect the nios2 cpu, which wouldn't influence these operating system
> +issues.
> +
> +Signed-off-by: Dan Nicholson<dbn.lists@gmail.com>
> +Tested-by: Frans Meulenbroeks<fransmeulenbroeks@gmail.com>
> +Reviewed-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +Reviewed-by: Julien Cristau<jcristau@debian.org>
> +Signed-off-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +---
> +diff --git a/configure.ac b/configure.ac
> +index 1b4a8b7..01f43fb 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
> +
> + # arch specific things
> + WCHAR32="1"
> +-case $target_alias in
> +- *os2*) os2="true" ; WCHAR32="0" ;;
> ++case $target_os in
> ++ os2*) os2="true" ; WCHAR32="0" ;;
> + *) ;;
> + esac
> + AC_SUBST(WCHAR32)
> +--
> +cgit v0.8.3-6-g21f6
> 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..2e2d475
> --- /dev/null
> +++ b/recipes/xorg-lib/libx11-1.3.99.903/configure.ac-nios2.patch
> @@ -0,0 +1,33 @@
> +From affc2488a7f2660a74dc8354fc3e0bff2c4f879c Mon Sep 17 00:00:00 2001
> +From: Dan Nicholson<dbn.lists@gmail.com>
> +Date: Sat, 06 Nov 2010 21:58:09 +0000
> +Subject: config: Fix architecture check for OS/2 to skip nios2 cpu
> +
> +The OS/2 platform requires some utility functions as well as having a
> +non-32 bit wchar_t. Fix the configure check so that it doesn't also
> +affect the nios2 cpu, which wouldn't influence these operating system
> +issues.
> +
> +Signed-off-by: Dan Nicholson<dbn.lists@gmail.com>
> +Tested-by: Frans Meulenbroeks<fransmeulenbroeks@gmail.com>
> +Reviewed-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +Reviewed-by: Julien Cristau<jcristau@debian.org>
> +Signed-off-by: Alan Coopersmith<alan.coopersmith@oracle.com>
> +---
> +diff --git a/configure.ac b/configure.ac
> +index 1b4a8b7..01f43fb 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -246,8 +246,8 @@ dnl AC_PATH_XTRA
> +
> + # arch specific things
> + WCHAR32="1"
> +-case $target_alias in
> +- *os2*) os2="true" ; WCHAR32="0" ;;
> ++case $target_os in
> ++ os2*) os2="true" ; WCHAR32="0" ;;
> + *) ;;
> + esac
> + AC_SUBST(WCHAR32)
> +--
> +cgit v0.8.3-6-g21f6
> 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"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system.
2010-11-17 14:21 ` Walter Goossens
@ 2010-11-17 15:08 ` Frans Meulenbroeks
0 siblings, 0 replies; 4+ messages in thread
From: Frans Meulenbroeks @ 2010-11-17 15:08 UTC (permalink / raw)
To: openembedded-devel
2010/11/17 Walter Goossens <waltergoossens@home.nl>:
> I just noticed my test build halted on that exact error...
> I'll ack this one :)
it is pushed :-)
Thanks for your acks.
I'm building console-image for nios as part of the testing branch.
Seems there is also yet another issue left in the toolchain, but
haven't had time to dig into that one.
Frans
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-17 15:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-17 13:58 [PATCH v2] libX11: patch configure.ac so a nios2 system is not seen as an os2 system Frans Meulenbroeks
2010-11-17 14:04 ` Martin Jansa
2010-11-17 14:21 ` Walter Goossens
2010-11-17 15:08 ` 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.