diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-29 10:33:39 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 13:46:37 +0200 |
| commit | 788b06d8f3c2e2aeb24d49d32b06f9c19ed85e1a (patch) | |
| tree | 4fab4644f1eeefb41100c883a2687d71a776c01a /patches | |
| parent | 8d271488369a1caa79678bde51f00f340759eb80 (diff) | |
| download | ptxdist-788b06d8f3c2e2aeb24d49d32b06f9c19ed85e1a.tar.gz ptxdist-788b06d8f3c2e2aeb24d49d32b06f9c19ed85e1a.tar.xz | |
xorg-server: fix building with SHM disabled
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/xorg-server-1.17.1/0002-xf86bigfont-always-include-unistd.h.patch | 37 | ||||
| -rw-r--r-- | patches/xorg-server-1.17.1/series | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/patches/xorg-server-1.17.1/0002-xf86bigfont-always-include-unistd.h.patch b/patches/xorg-server-1.17.1/0002-xf86bigfont-always-include-unistd.h.patch new file mode 100644 index 000000000..5792f3cd4 --- /dev/null +++ b/patches/xorg-server-1.17.1/0002-xf86bigfont-always-include-unistd.h.patch @@ -0,0 +1,37 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 28 May 2015 23:47:37 +0200 +Subject: [PATCH] xf86bigfont: always include unistd.h + +Otherwise compiling can fail with: + +xf86bigfont.c: In function 'ProcXF86BigfontQueryVersion': +xf86bigfont.c:287:9: error: implicit declaration of function 'geteuid' [-Werror=implicit-function-declaration] +xf86bigfont.c:287:9: warning: nested extern declaration of 'geteuid' [-Wnested-externs] +xf86bigfont.c:288:9: error: implicit declaration of function 'getegid' [-Werror=implicit-function-declaration] +xf86bigfont.c:288:9: warning: nested extern declaration of 'getegid' [-Wnested-externs] + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + Xext/xf86bigfont.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c +index 46b3242d1bc9..65df73449b4c 100644 +--- a/Xext/xf86bigfont.c ++++ b/Xext/xf86bigfont.c +@@ -39,6 +39,7 @@ + #endif + + #include <sys/types.h> ++#include <unistd.h> + #ifdef HAS_SHM + #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) + /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */ +@@ -58,7 +59,6 @@ + #include <sys/shm.h> + #include <sys/stat.h> + #include <stdlib.h> +-#include <unistd.h> + #include <time.h> + #include <errno.h> + #endif diff --git a/patches/xorg-server-1.17.1/series b/patches/xorg-server-1.17.1/series index cd63355d4..23227fdfc 100644 --- a/patches/xorg-server-1.17.1/series +++ b/patches/xorg-server-1.17.1/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-glamor-fix-build-when-DRI3-is-not-defined.patch -# e7f44e73fde878fa68a0c09896edc8bb - git-ptx-patches magic +0002-xf86bigfont-always-include-unistd.h.patch +# 66b7ddc3c7f6ee95700b6480f61f6496 - git-ptx-patches magic |