summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-11 16:07:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:44:33 +0100
commit5f8a1525138817ff71cfb3eee12d28a76bfa1af1 (patch)
tree35f9bb403ea21b3a80ee4f174092c1844103be22
parent96b4362ce2da353d1264196c9b15521a38eb637a (diff)
downloadpoky-5f8a1525138817ff71cfb3eee12d28a76bfa1af1.tar.gz
xf86-video-intel: Fix for glibc
It fails to build wi9th glibc 2.28, add the missing required header inclusion. (From OE-Core rev: 8f5f23a5a985f5d48973f27c143b0d5edb8ca797) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch25
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb1
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch
new file mode 100644
index 0000000000..ada9eb5e52
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch
@@ -0,0 +1,25 @@
1Add a missing include needed for glibc 2.28 to avoid:
2
3| ../../git/tools/backlight_helper.c: In function 'main':
4| ../../git/tools/backlight_helper.c:54:34: error: implicit declaration of function 'major' [-Werror=implicit-function-declaration]
5| if (fd < 0 || fstat(fd, &st) || major(st.st_dev))
6| ^~~~~
7| ../../git/tools/backlight_helper.c:54:34: warning: nested extern declaration of 'major' [-Wnested-externs]
8| cc1: some warnings being treated as errors
9| Makefile:666: recipe for target 'backlight_helper.o' failed
10
11Upstream-Status: Pending
12RP 2018/8/12
13
14Index: git/tools/backlight_helper.c
15===================================================================
16--- git.orig/tools/backlight_helper.c
17+++ git/tools/backlight_helper.c
18@@ -8,6 +8,7 @@
19
20 #include <sys/types.h>
21 #include <sys/stat.h>
22+#include <sys/sysmacros.h>
23
24 #if MAJOR_IN_MKDEV
25 #include <sys/mkdev.h>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 5cc4eefc78..655fd4dc69 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
15 15
16SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ 16SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
17 file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \ 17 file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \
18 file://glibc.patch \
18 " 19 "
19 20
20UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 21UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"