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 | |
| 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')
| -rw-r--r-- | patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch (renamed from patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch) | 20 | ||||
| l--------- | patches/glib-2.28.0/autogen.sh (renamed from patches/glib-2.26.1/autogen.sh) | 0 | ||||
| -rw-r--r-- | patches/glib-2.28.0/series (renamed from patches/glib-2.26.1/series) | 0 |
3 files changed, 8 insertions, 12 deletions
diff --git a/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch index bfaf4e810..4a10daa39 100644 --- a/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch +++ b/patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch @@ -10,19 +10,18 @@ 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 | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) + configure.ac | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index ea73394..b86a785 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -956,7 +956,22 @@ AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getg +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(nanosleep nsleep) -AC_CHECK_FUNCS(splice) -+ +AC_CACHE_CHECK([for splice()], + [ac_cv_func_splice], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -41,6 +40,3 @@ index ea73394..b86a785 100644 AC_CHECK_HEADERS(crt_externs.h) AC_CHECK_FUNCS(_NSGetEnviron) --- -1.7.2.3 - diff --git a/patches/glib-2.26.1/autogen.sh b/patches/glib-2.28.0/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/glib-2.26.1/autogen.sh +++ b/patches/glib-2.28.0/autogen.sh diff --git a/patches/glib-2.26.1/series b/patches/glib-2.28.0/series index 8c17b0eb2..8c17b0eb2 100644 --- a/patches/glib-2.26.1/series +++ b/patches/glib-2.28.0/series |