From 24fd4959aea55829c6095c81138daee2c5b5107f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Apr 2015 17:36:49 +0000 Subject: 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../xorg-lib/libpciaccess/limits.patch | 17 +++++++++++++ .../xorg-lib/libpciaccess_0.13.3.bb | 2 ++ .../xorg-lib/pixman/asm_include.patch | 29 ++++++++++++++++++++++ meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb | 1 + 4 files changed, 49 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch create mode 100644 meta/recipes-graphics/xorg-lib/pixman/asm_include.patch 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 @@ +Add missing include file to get definition of PATH_MAX + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: libpciaccess-0.13.3/src/linux_sysfs.c +=================================================================== +--- libpciaccess-0.13.3.orig/src/linux_sysfs.c ++++ libpciaccess-0.13.3/src/linux_sysfs.c +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) + #include 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." require xorg-lib-common.inc +SRC_URI += "file://limits.patch" + LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" 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 @@ +Fixes errors like + +Assembler messages: +Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory + +it works with glibc because it uses gcc fixed-headers but thats not right. + +We move the include under C block + +Signed-off-by: Khem Raj +Upstream-Status: Pending +Index: pixman-0.32.6/pixman/pixman-private.h +=================================================================== +--- pixman-0.32.6.orig/pixman/pixman-private.h ++++ pixman-0.32.6/pixman/pixman-private.h +@@ -1,4 +1,3 @@ +-#include + + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H +@@ -17,6 +16,8 @@ + + #ifndef __ASSEMBLER__ + ++#include ++ + #ifndef PACKAGE + # error config.h must be included before pixman-private.h + #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" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ file://mips-export-revert.patch \ + file://asm_include.patch \ " SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" -- cgit 1.2.3-korg