diff options
| -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 | ||||
| -rw-r--r-- | rules/dconf.in | 1 | ||||
| -rw-r--r-- | rules/glib.in | 6 | ||||
| -rw-r--r-- | rules/glib.make | 10 |
6 files changed, 16 insertions, 21 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 diff --git a/rules/dconf.in b/rules/dconf.in index 8e60bb95f..2da990783 100644 --- a/rules/dconf.in +++ b/rules/dconf.in @@ -3,7 +3,6 @@ config DCONF tristate select GLIB - select GLIB_EXPERIMENTAL select LIBC_RT select LIBC_RESOLV select DBUS diff --git a/rules/glib.in b/rules/glib.in index 3893d2c96..80a761a22 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -22,9 +22,9 @@ menuconfig GLIB if GLIB -config GLIB_EXPERIMENTAL - bool - prompt "experimental version" +#config GLIB_EXPERIMENTAL +# bool +# prompt "experimental version" choice diff --git a/rules/glib.make b/rules/glib.make index c4aaae186..38e3b9530 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # -ifdef PTXCONF_GLIB_EXPERIMENTAL -GLIB_VERSION := 2.27.93 -else -GLIB_VERSION := 2.26.1 -endif +#ifdef PTXCONF_GLIB_EXPERIMENTAL +#GLIB_VERSION := 2.27.93 +#else +GLIB_VERSION := 2.28.0 +#endif GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX := tar.bz2 |