diff options
| author | George McCollister <george.mccollister@gmail.com> | 2010-12-08 09:24:39 -0600 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-12-23 11:46:13 +0100 |
| commit | 7ef06b7c6719255732e0b1cc158512f2e9e88d96 (patch) | |
| tree | 3cd3117e81434f699808e637dd3f6cd7db18c7ef | |
| parent | 72a5493301b2a9d05cfb89ec87734638b1610c12 (diff) | |
| download | ptxdist-7ef06b7c6719255732e0b1cc158512f2e9e88d96.tar.gz ptxdist-7ef06b7c6719255732e0b1cc158512f2e9e88d96.tar.xz | |
glib: check if splice() takes 6 arguments
checking for the presence of splice() isn't sufficient. Older
implimentations only accept 4 arguments while this version of glib
assumes that it takes 6. glib now selects HOST_GTK_DOC which it needs to
do autogen.
Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch | 45 | ||||
| l--------- | patches/glib-2.24.1/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/glib-2.24.1/series | 1 | ||||
| -rw-r--r-- | rules/glib.in | 1 |
4 files changed, 48 insertions, 0 deletions
diff --git a/patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch new file mode 100644 index 000000000..58e0fc633 --- /dev/null +++ b/patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch @@ -0,0 +1,45 @@ +From f032da4a05d63b57c9c7659185a64d4e2f4240d7 Mon Sep 17 00:00:00 2001 +From: George McCollister <george.mccollister@gmail.com> +Date: Thu, 2 Dec 2010 09:31:38 -0600 +Subject: [PATCH] check if splice() takes 6 arguments + +checking for the presence of splice() isn't sufficient. Older +implimentations only accept 4 arguments while this version of glib +assumes that it takes 6. + +Signed-off-by: George McCollister <george.mccollister@gmail.com> +--- + configure.in | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index f6d80fb..bb7266c 100644 +--- a/configure.in ++++ b/configure.in +@@ -969,7 +969,22 @@ AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getg + AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo) + # Check for high-resolution sleep functions + AC_CHECK_FUNCS(nanosleep nsleep) +-AC_CHECK_FUNCS(splice) ++ ++AC_CACHE_CHECK([for splice()], ++ [ac_cv_func_splice], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ++#define _GNU_SOURCE ++#include <stdlib.h> ++#include <fcntl.h> ++ ]],[[ ++ splice(0, NULL, 0, NULL, (size_t)0, (unsigned int)0); ++ ]])], ++ [ac_cv_func_splice=yes], ++ [ac_cv_func_splice=no])]) ++ ++AS_IF([test "x$ac_cv_func_splice" = "xyes"],[ ++ AC_DEFINE([HAVE_SPLICE],[1],[If we have splice]) ++]) + + AC_CHECK_HEADERS(crt_externs.h) + AC_CHECK_FUNCS(_NSGetEnviron) +-- +1.7.1 + diff --git a/patches/glib-2.24.1/autogen.sh b/patches/glib-2.24.1/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/glib-2.24.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/glib-2.24.1/series b/patches/glib-2.24.1/series new file mode 100644 index 000000000..e9a9196c2 --- /dev/null +++ b/patches/glib-2.24.1/series @@ -0,0 +1 @@ +0001-check-if-splice-takes-6-arguments.patch diff --git a/rules/glib.in b/rules/glib.in index e6cb8fcf8..f9f6ddefe 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -6,6 +6,7 @@ menuconfig GLIB select GETTEXT if GLIB_GETTEXT_GETTEXT select GETTEXT_DUMMY if GLIB_GETTEXT_DUMMY select HOST_GLIB + select HOST_GTK_DOC select ICONV select ZLIB help |