[Buildroot] [PATCH 1/2] pixman: bump version to 0.33.6

[Buildroot] [PATCH 1/2] pixman: bump version to 0.33.6

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pixman/pixman.hash | 4 ++--
 package/pixman/pixman.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash
index 66decf6..7a37220 100644
--- a/package/pixman/pixman.hash
+++ b/package/pixman/pixman.hash
@@ -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
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index a130af9..fc43140 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -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
-- 
2.6.4

[Buildroot] [PATCH 2/2] pixman: add patch to fix build issue with musl

[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 <eial@scalemp.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...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

diff --git a/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
new file mode 100644
index 0000000..455cebb
--- /dev/null
+++ b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
@@ -0,0 +1,46 @@
+From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+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 <thomas.petazzoni@free-electrons.com>
+---
+ 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
+
-- 
2.6.4

[Buildroot] [PATCH 2/2] pixman: add patch to fix build issue with musl

[Eial Czerwacki]

thanks, will try.

On 01/17/2016 04:40 PM, Thomas Petazzoni wrote:
> 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 <eial@scalemp.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  ...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
>
> diff --git a/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
> new file mode 100644
> index 0000000..455cebb
> --- /dev/null
> +++ b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
> @@ -0,0 +1,46 @@
> +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001
> +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +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 <thomas.petazzoni@free-electrons.com>
> +---
> + 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
> +

[Buildroot] [PATCH 2/2] pixman: add patch to fix build issue with musl

[Eial Czerwacki]

the patch above fixed the issue, thanks.

now I have a python related failure but I'll send another mail on it.

On 01/17/2016 04:41 PM, Eial Czerwacki wrote:
> thanks, will try.
>
> On 01/17/2016 04:40 PM, Thomas Petazzoni wrote:
>> 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 <eial@scalemp.com>
>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> ---
>>  ...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
>>
>> diff --git a/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
>> new file mode 100644
>> index 0000000..455cebb
>> --- /dev/null
>> +++ b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
>> @@ -0,0 +1,46 @@
>> +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001
>> +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> +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 <thomas.petazzoni@free-electrons.com>
>> +---
>> + 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
>> +
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

[Buildroot] [PATCH 2/2] pixman: add patch to fix build issue with musl

[Eial Czerwacki]

Greetings,

is there any intention to commit this patch to buildroot's git

Thanks.

On 01/17/2016 05:38 PM, Eial Czerwacki wrote:
> the patch above fixed the issue, thanks.
>
> now I have a python related failure but I'll send another mail on it.
>
> On 01/17/2016 04:41 PM, Eial Czerwacki wrote:
>> thanks, will try.
>>
>> On 01/17/2016 04:40 PM, Thomas Petazzoni wrote:
>>> 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 <eial@scalemp.com>
>>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>> ---
>>>  ...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
>>>
>>> diff --git a/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
>>> new file mode 100644
>>> index 0000000..455cebb
>>> --- /dev/null
>>> +++ b/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch
>>> @@ -0,0 +1,46 @@
>>> +From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001
>>> +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>> +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 <thomas.petazzoni@free-electrons.com>
>>> +---
>>> + 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
>>> +
>> _______________________________________________
>> 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
>

[Buildroot] [PATCH 2/2] pixman: add patch to fix build issue with musl

[Thomas Petazzoni]

Hello,

On Wed, 20 Jan 2016 08:25:39 +0200, Eial Czerwacki wrote:

> 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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] pixman: bump version to 0.33.6

[Thomas Petazzoni]

Hello,

On Sun, 17 Jan 2016 15:39:59 +0100, Thomas Petazzoni wrote:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  package/pixman/pixman.hash | 4 ++--
>  package/pixman/pixman.mk   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Both patches applied.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com