diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-02-18 09:52:06 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-02-18 09:52:06 +0100 |
| commit | e9e66a4f6a692265b8ef0d710642722d3b4270c9 (patch) | |
| tree | 9de8628ed727f32636e41234082c8e88f48a2219 /patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch | |
| parent | 9251ffe202e498a7efd91c86c7a17efb98822d79 (diff) | |
| download | ptxdist-e9e66a4f6a692265b8ef0d710642722d3b4270c9.tar.gz ptxdist-e9e66a4f6a692265b8ef0d710642722d3b4270c9.tar.xz | |
glib: version bump 2.26.1 -> 2.28.0
There is a new stable series out there, so this patch bumps to 2.28. As
this is almost identical with the former 2.27.93 beta version, remove
the experimental version for now. The result was build-tested with the
AllYes BSP.
We leave the experimental mechanism in the rules file: there is
currently no experimental series released yet, but this will happen
again in the future.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch')
| -rw-r--r-- | patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch new file mode 100644 index 000000000..4a10daa39 --- /dev/null +++ b/patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch @@ -0,0 +1,42 @@ +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> +[mol: configure.in -> configure.ac] +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.ac | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +Index: glib-2.27.93/configure.ac +=================================================================== +--- glib-2.27.93.orig/configure.ac ++++ glib-2.27.93/configure.ac +@@ -948,7 +948,21 @@ AC_CHECK_FUNCS(lstat strerror strsignal + AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid) + AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo) + # Check for high-resolution sleep functions +-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) |