summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-10-27 14:42:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-10-28 12:05:51 +0100
commitd1a82ab9547759e586d20e9276d33354060f9ba9 (patch)
treef960a9f27b111fd96a24e3d49e11d716cd16ac83 /rules
parentb7ef1b21a70c85e31acc518725b4d20cc06a9a49 (diff)
downloadptxdist-d1a82ab9547759e586d20e9276d33354060f9ba9.tar.gz
ptxdist-d1a82ab9547759e586d20e9276d33354060f9ba9.tar.xz
glib: version bump: 2.32.3 -> 2.34.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/glib.make19
-rw-r--r--rules/host-glib.make13
2 files changed, 25 insertions, 7 deletions
diff --git a/rules/glib.make b/rules/glib.make
index 7e49a3b87..ce4d4fac1 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.32.3
-GLIB_MD5 := 9bd3ac535c24b6c162be13b2c43c5adc
+GLIB_VERSION := 2.34.1
+GLIB_MD5 := ee779493b083be9348a841e0a51f1b27
#endif
GLIB := glib-$(GLIB_VERSION)
@@ -60,19 +60,24 @@ GLIB_AUTOCONF := \
--enable-debug=minimum \
--disable-gc-friendly \
--enable-mem-pools \
- --with-threads=posix \
--disable-rebuilds \
+ --disable-modular-tests \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-static \
+ --enable-shared \
--disable-included-printf \
--disable-selinux \
--disable-fam \
--disable-xattr \
+ --disable-libelf \
--disable-gtk-doc \
--disable-man \
- --with-pcre=internal \
- --enable-static \
- --enable-shared \
+ --disable-dtrace \
+ --disable-systemtap \
+ --disable-gcov \
--with-libiconv=no \
- --disable-gcov
+ --with-threads=posix \
+ --with-pcre=internal
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/host-glib.make b/rules/host-glib.make
index a5bef4aba..727a1e303 100644
--- a/rules/host-glib.make
+++ b/rules/host-glib.make
@@ -34,6 +34,19 @@ HOST_GLIB_ENV := $(HOST_ENV)
#
HOST_GLIB_AUTOCONF := \
$(HOST_AUTOCONF) \
+ --enable-silent-rules \
+ --disable-debug \
+ --disable-rebuilds \
+ --disable-modular-tests \
+ --disable-static \
+ --enable-shared \
+ --disable-fam \
+ --disable-libelf \
+ --disable-gtk-doc \
+ --disable-man \
+ --disable-dtrace \
+ --disable-systemtap \
+ --disable-gcov \
--with-libiconv=gnu
# vim: syntax=make