summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-06 17:36:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:29 +0100
commitde32267517d61ebf4f66a859b7fe85da3549804a (patch)
tree4a17927dcc19d7740fce11068ecf26f1532472e0
parentbe8ffcd261ccd8b7acde0d291e93d1b27f6edde8 (diff)
downloadpoky-de32267517d61ebf4f66a859b7fe85da3549804a.tar.gz
pixman,libpciaccess: Fix build on musl
The fixes are not specific to musl, however they came to surface due to musl, these are generic problems which should be fixed in components Change-Id: If9aa95968d9dec9c16e3e5819955befcaa38937c (From OE-Core rev: 24fd4959aea55829c6095c81138daee2c5b5107f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch17
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman/asm_include.patch29
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb1
4 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
new file mode 100644
index 0000000000..498020e534
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
@@ -0,0 +1,17 @@
1Add missing include file to get definition of PATH_MAX
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: libpciaccess-0.13.3/src/linux_sysfs.c
7===================================================================
8--- libpciaccess-0.13.3.orig/src/linux_sysfs.c
9+++ libpciaccess-0.13.3/src/linux_sysfs.c
10@@ -44,6 +44,7 @@
11 #include <sys/mman.h>
12 #include <dirent.h>
13 #include <errno.h>
14+#include <limits.h>
15
16 #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
17 #include <sys/io.h>
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
index bbba24eb9a..4a832e8ccb 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
@@ -5,6 +5,8 @@ PCI bus and devices in a platform-independent way."
5 5
6require xorg-lib-common.inc 6require xorg-lib-common.inc
7 7
8SRC_URI += "file://limits.patch"
9
8LICENSE = "MIT & MIT-style" 10LICENSE = "MIT & MIT-style"
9LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" 11LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
10 12
diff --git a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
new file mode 100644
index 0000000000..b52a5707d6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
@@ -0,0 +1,29 @@
1Fixes errors like
2
3Assembler messages:
4Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory
5
6it works with glibc because it uses gcc fixed-headers but thats not right.
7
8We move the include under C block
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Upstream-Status: Pending
12Index: pixman-0.32.6/pixman/pixman-private.h
13===================================================================
14--- pixman-0.32.6.orig/pixman/pixman-private.h
15+++ pixman-0.32.6/pixman/pixman-private.h
16@@ -1,4 +1,3 @@
17-#include <float.h>
18
19 #ifndef PIXMAN_PRIVATE_H
20 #define PIXMAN_PRIVATE_H
21@@ -17,6 +16,8 @@
22
23 #ifndef __ASSEMBLER__
24
25+#include <float.h>
26+
27 #ifndef PACKAGE
28 # error config.h must be included before pixman-private.h
29 #endif
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
index 467ba508ee..eae59b62d2 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
@@ -30,6 +30,7 @@ EXTRA_OECONF_class-native = "--disable-gtk"
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ 31 file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
32 file://mips-export-revert.patch \ 32 file://mips-export-revert.patch \
33 file://asm_include.patch \
33" 34"
34 35
35SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" 36SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344"