diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-09-14 14:32:27 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-09-14 14:32:27 +0200 |
| commit | 853b15071139b66be1723be0491881c0c390331b (patch) | |
| tree | ccd5c717d665504bf4c1fa687e7c2f6604b9040f /recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb | |
| parent | d5e549115091f5b808abdfd0721c2656d11b74df (diff) | |
xserver-xorg: Backport patch to remove using sys/io.h
latest glibc dropped support for sys/io.h on arm, which is fixed in
upstream xserver, as a bonus we can drop musl specific patch which was
doing something similar up until now.
Fixes
|In file included from ../../../../xorg-server-1.20.4/hw/xfree86/int10/generic.c:15:
| ../../../../xorg-server-1.20.4/hw/xfree86/common/compiler.h:767:10: fatal error: 'sys/io.h' file not found
| #include <sys/io.h>
| ^~~~~~~~~~
| 1 error generated.
(From OE-Core rev: 1c72953b6c890b8411fec997b5c28a17eed82897)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb')
| -rwxr-xr-x | recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb index 06632b6..75d4076 100755 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb @@ -3,7 +3,10 @@ require recipes-graphics/xorg-xserver/xserver-xorg.inc SRC_URI[md5sum] = "1509a9daae713895e7f5bcba8bcc05b2" SRC_URI[sha256sum] = "0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457" -SRC_URI += "file://0001-sysmacros.h-follow-changed-include-files.patch" +SRC_URI += " \ + file://0001-sysmacros.h-follow-changed-include-files.patch \ + file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ +" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. |