mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

xserver-xorg: Fix build with musl

Browse Source 
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>
This commit is contained in:
Khem Raj
2015-12-17 07:10:13 +00:00
committed by Richard Purdie
parent b8de631578
commit f2cf5d3398
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
+18
View File
@@ -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 */
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
+3 -1
View File
@@ -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"