diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-14 10:39:25 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-15 11:52:21 +0200 |
| commit | cebcdf8ca2ab11301f6b4c318cd69d6c1766afa8 (patch) | |
| tree | 3b1c259b21b897f367a3c6afe5e92af0466accb0 | |
| parent | 02e4c2db69b03d18d5d87d812bd809a8c9fc289f (diff) | |
| download | ptxdist-cebcdf8ca2ab11301f6b4c318cd69d6c1766afa8.tar.gz ptxdist-cebcdf8ca2ab11301f6b4c318cd69d6c1766afa8.tar.xz | |
glib: version bump 2.34.3 -> 2.36.3
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/glib-2.36.3/0001-check-if-splice-takes-6-arguments.patch (renamed from patches/glib-2.34.3/0001-check-if-splice-takes-6-arguments.patch) | 8 | ||||
| l--------- | patches/glib-2.36.3/autogen.sh (renamed from patches/glib-2.34.3/autogen.sh) | 0 | ||||
| -rw-r--r-- | patches/glib-2.36.3/series (renamed from patches/glib-2.34.3/series) | 0 | ||||
| -rw-r--r-- | rules/glib.make | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/patches/glib-2.34.3/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.36.3/0001-check-if-splice-takes-6-arguments.patch index fe4951a7c..a63a219d2 100644 --- a/patches/glib-2.34.3/0001-check-if-splice-takes-6-arguments.patch +++ b/patches/glib-2.36.3/0001-check-if-splice-takes-6-arguments.patch @@ -13,13 +13,13 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> configure.ac | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 07ab229..5b593fd 100644 +Index: b/configure.ac +=================================================================== --- a/configure.ac +++ b/configure.ac -@@ -999,7 +999,21 @@ AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strn +@@ -994,7 +994,21 @@ AC_CHECK_FUNCS(lstat strerror strsignal AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid) - AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat) + AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat fallocate) # Check for high-resolution sleep functions -AC_CHECK_FUNCS(splice) +AC_CACHE_CHECK([for splice()], diff --git a/patches/glib-2.34.3/autogen.sh b/patches/glib-2.36.3/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/glib-2.34.3/autogen.sh +++ b/patches/glib-2.36.3/autogen.sh diff --git a/patches/glib-2.34.3/series b/patches/glib-2.36.3/series index d1f211b45..d1f211b45 100644 --- a/patches/glib-2.34.3/series +++ b/patches/glib-2.36.3/series diff --git a/rules/glib.make b/rules/glib.make index 29d350c5d..483a8c8bf 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -21,8 +21,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib #GLIB_VERSION := 2.27.93 #GLIB_MD5 := #else -GLIB_VERSION := 2.34.3 -GLIB_MD5 := a4ca31e258273c3761e3de2edd607661 +GLIB_VERSION := 2.36.3 +GLIB_MD5 := 89180c7354b0acd3efb0a36ac05ca39c #endif GLIB := glib-$(GLIB_VERSION) |