summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-17 07:10:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:26 +0000
commitf2cf5d33982e8f805690615047de971031d02543 (patch)
treeab0438eee164537ad66b0ca7d610cd5f9ef0d735 /meta
parentb8de63157841b13c3ff5f373918267f36a0fd0b1 (diff)
downloadpoky-f2cf5d33982e8f805690615047de971031d02543.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 (From OE-Core rev: 8920e520b58118c72c68e739c780efd71c1650d3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch18
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb4
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 0000000000..4be441fb71
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
@@ -0,0 +1,18 @@
1inb/outb family for arm is only implemented on glibc
2so assumption across linux is wrong
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Pending
6Index: xorg-server-1.18.0/hw/xfree86/common/compiler.h
7===================================================================
8--- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h
9+++ xorg-server-1.18.0/hw/xfree86/common/compiler.h
10@@ -758,7 +758,7 @@ inl(unsigned short port)
11 return xf86ReadMmio32Le((void *) ioBase, port);
12 }
13
14-#elif defined(__arm__) && defined(__linux__)
15+#elif defined(__arm__) && defined(__GLIBC__)
16
17 /* for Linux on ARM, we use the LIBC inx/outx routines */
18 /* 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 60973c5ac9..e606dac5f9 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 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch" 3SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \
4 file://musl-arm-inb-outb.patch \
5 "
4SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" 6SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
5SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" 7SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
6 8