pixman: bump version to 0.33.6
PATCH 1/2 pixman: bump version to 0.33.6
Signed-off-by Thomas Petazzoni <[email protected]>
--- package/pixman/pixman.hash | 4 ++-- package/pixman/pixman.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/pixman/pixman.hash +2 -2
@@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-October/002644.html -sha1 dff77cd08412b33ab0294057ade93e401c8a9302 pixman-0.33.4.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-December/002666.html +sha1 11e93fed35deb9c89347e7a7da3060e5e5c89412 pixman-0.33.6.tar.bz2
package/pixman/pixman.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.33.4 +PIXMAN_VERSION = 0.33.6 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT
Signature · 1 line
2.6.4
PATCH 1/2 pixman: bump version to 0.33.6
Hello,
Quoted 5 lines · Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>--- package/pixman/pixman.hash | 4 ++-- package/pixman/pixman.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Both patches applied.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 2/2 pixman: add patch to fix build issue with musl
In reply to Thomas Petazzonipixman fails to build with musl because <float.h> is included in assembler files, which doesn't work with the <float.h> provided by musl. This commit fixes that by patching pixman (patch submitted upstream).
Reported-by Eial Czerwacki <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>
--- ...an-private-include-float.h-only-in-C-code.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 17 Jan 2016 14:14:28 +0100 +Subject: [PATCH] pixman-private: include <float.h> only in C code + +<float.h> is included unconditionally by pixman-private.h, which in +turn gets included by assembler files. Unfortunately, with certain C +libraries (like the musl C library), <float.h> cannot be included in +assembler files: + + CCLD libpixman-arm-simd.la +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' + +It turns out however that <float.h> is not needed by assembly files, +so we move its inclusion within the #ifndef __ASSEMBLER__ condition, +which solves the problem. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + pixman/pixman-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 73108a0..73a5414 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -1,5 +1,3 @@ +-#include <float.h> +- + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H + +@@ -30,6 +28,7 @@ + #include <stdio.h> + #include <string.h> + #include <stddef.h> ++#include <float.h> + + #include "pixman-compiler.h" + +-- +2.6.4 +
Signature · 1 line
2.6.4
PATCH 2/2 pixman: add patch to fix build issue with musl
thanks, will try.
Quoted 64 lines · Thomas Petazzoni
pixman fails to build with musl because <
float.h> is included in assembler files, which doesn't work with the <float.h> provided by musl. This commit fixes that by patching pixman (patch submitted upstream).Reported-by Eial Czerwacki <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>--- ...an-private-include-float.h-only-in-C-code.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patchpackage/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch new file +46
-0@@ -0,0 +1,46 @@ +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 17 Jan 2016 14:14:28 +0100 +Subject: [PATCH] pixman-private: include <float.h> only in C code + +<float.h> is included unconditionally by pixman-private.h, which in +turn gets included by assembler files. Unfortunately, with certain C +libraries (like the musl C library), <float.h> cannot be included in +assembler files: + + CCLD libpixman-arm-simd.la +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' + +It turns out however that <float.h> is not needed by assembly files, +so we move its inclusion within the #ifndef __ASSEMBLER__ condition, +which solves the problem. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + pixman/pixman-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 73108a0..73a5414 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -1,5 +1,3 @@ +-#include <float.h> +- + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H + +@@ -30,6 +28,7 @@ + #include <stdio.h> + #include <string.h> + #include <stddef.h> ++#include <float.h> + + #include "pixman-compiler.h" + +-- +2.6.4 +
PATCH 2/2 pixman: add patch to fix build issue with musl
the patch above fixed the issue, thanks.
now I have a python related failure but I'll send another mail on it.
Quoted 72 lines · Eial Czerwacki
thanks, will try.
Quoted 54 lines · Thomas Petazzoni
pixman fails to build with musl because <
float.h> is included in assembler files, which doesn't work with the <float.h> provided by musl. This commit fixes that by patching pixman (patch submitted upstream).Reported-by Eial Czerwacki <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>--- ...an-private-include-float.h-only-in-C-code.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patchpackage/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch new file +36
-0@@ -0,0 +1,46 @@ +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 17 Jan 2016 14:14:28 +0100 +Subject: [PATCH] pixman-private: include <float.h> only in C code + +<float.h> is included unconditionally by pixman-private.h, which in +turn gets included by assembler files. Unfortunately, with certain C +libraries (like the musl C library), <float.h> cannot be included in +assembler files: + + CCLD libpixman-arm-simd.la +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' + +It turns out however that <float.h> is not needed by assembly files, +so we move its inclusion within the #ifndef __ASSEMBLER__ condition, +which solves the problem. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + pixman/pixman-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 73108a0..73a5414 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -1,5 +1,3 @@ +-#include <float.h> +- + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H + +@@ -30,6 +28,7 @@package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch line 46
Quoted 10 lines
package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch new file +10
-0+ #include <stdio.h> + #include <string.h> + #include <stddef.h> ++#include <float.h> + + #include "pixman-compiler.h" + +-- +2.6.4 +_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/2 pixman: add patch to fix build issue with musl
Greetings,
is there any intention to commit this patch to buildroot's git
Thanks.
Quoted 82 lines · Eial Czerwacki
the patch above fixed the issue, thanks.
now I have a python related failure but I'll send another mail on it.
Quoted 63 lines · Eial Czerwacki
thanks, will try.
Quoted 60 lines · Thomas Petazzoni
pixman fails to build with musl because <
float.h> is included in assembler files, which doesn't work with the <float.h> provided by musl. This commit fixes that by patching pixman (patch submitted upstream).Reported-by Eial Czerwacki <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>--- ...an-private-include-float.h-only-in-C-code.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patchpackage/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch new file +42
-0@@ -0,0 +1,46 @@ +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 17 Jan 2016 14:14:28 +0100 +Subject: [PATCH] pixman-private: include <float.h> only in C code + +<float.h> is included unconditionally by pixman-private.h, which in +turn gets included by assembler files. Unfortunately, with certain C +libraries (like the musl C library), <float.h> cannot be included in +assembler files: + + CCLD libpixman-arm-simd.la +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: +/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' + +It turns out however that <float.h> is not needed by assembly files, +so we move its inclusion within the #ifndef __ASSEMBLER__ condition, +which solves the problem. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + pixman/pixman-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 73108a0..73a5414 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -1,5 +1,3 @@ +-#include <float.h> +- + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H + +@@ -30,6 +28,7 @@ + #include <stdio.h> + #include <string.h> + #include <stddef.h> ++#include <float.h> + + #include "pixman-compiler.h"Quoted 9 lines
package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch line 46
Quoted 4 lines
package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch new file +4
-0+ +-- +2.6.4 +_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/2 pixman: add patch to fix build issue with musl
Hello,
Quoted 1 line · Eial Czerwacki
is there any intention to commit this patch to buildroot's git
Yes, especially since I got a Reviewed-by on this patch that I sent on the pixman@ mailing list.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com