diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-12-17 07:10:13 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:46 +0000 |
| commit | 8920e520b58118c72c68e739c780efd71c1650d3 (patch) | |
| tree | 63295669a1898ad89fd670e7bd3749e5567da560 /meta/recipes-graphics | |
| parent | 10344e1e7ededd26b9a7b57bc2ff247803111590 (diff) | |
| download | openembedded-core-contrib-8920e520b58118c72c68e739c780efd71c1650d3.tar.gz | |
xserver-xorg: Fix build with musl
inb/outb are implemented for ARM on glibc but not on linux in general
therefore the conditional has to reflect that
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch new file mode 100644 index 00000000000..4be441fb715 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch @@ -0,0 +1,18 @@ +inb/outb family for arm is only implemented on glibc +so assumption across linux is wrong + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: xorg-server-1.18.0/hw/xfree86/common/compiler.h +=================================================================== +--- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h ++++ xorg-server-1.18.0/hw/xfree86/common/compiler.h +@@ -758,7 +758,7 @@ inl(unsigned short port) + return xf86ReadMmio32Le((void *) ioBase, port); + } + +-#elif defined(__arm__) && defined(__linux__) ++#elif defined(__arm__) && defined(__GLIBC__) + + /* for Linux on ARM, we use the LIBC inx/outx routines */ + /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb index 60973c5ac9f..e606dac5f94 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb @@ -1,6 +1,8 @@ require xserver-xorg.inc -SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch" +SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ + file://musl-arm-inb-outb.patch \ + " SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" |