diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 10:38:37 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 10:39:19 +0200 |
| commit | 5b68053005aed6ffe70bd431d740b40a319231d3 (patch) | |
| tree | c61b95015f9599a03ab9da8ab50492ed04da0e28 /rules | |
| parent | f9a78b0eebd6eb07bf4e56887d3708e9cfcbaf40 (diff) | |
| download | ptxdist-5b68053005aed6ffe70bd431d740b40a319231d3.tar.gz ptxdist-5b68053005aed6ffe70bd431d740b40a319231d3.tar.xz | |
glib: version bump 2.46.0 -> 2.48.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/glib.make | 6 | ||||
| -rw-r--r-- | rules/host-glib.make | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/rules/glib.make b/rules/glib.make index a20e94921..84aa4cec1 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.46.0 -GLIB_MD5 := 6d58f9d70893a63e75c2b7df79375ee7 +GLIB_VERSION := 2.48.0 +GLIB_MD5 := 093a586f37d2853bdb129231e1b350e0 #endif GLIB := glib-$(GLIB_VERSION) @@ -57,7 +57,7 @@ GLIB_CONF_ENV := \ GLIB_CONF_TOOL := autoconf GLIB_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --enable-silent-rules \ + --runstatedir=/run \ --enable-debug=minimum \ --disable-gc-friendly \ --enable-mem-pools \ diff --git a/rules/host-glib.make b/rules/host-glib.make index 8f6bea474..c5bd4386c 100644 --- a/rules/host-glib.make +++ b/rules/host-glib.make @@ -33,7 +33,6 @@ HOST_GLIB_CONF_ENV := \ HOST_GLIB_CONF_TOOL := autoconf HOST_GLIB_CONF_OPT := \ $(HOST_AUTOCONF) \ - --enable-silent-rules \ --disable-debug \ --disable-gc-friendly \ --enable-mem-pools \ @@ -51,7 +50,10 @@ HOST_GLIB_CONF_OPT := \ --disable-man \ --disable-dtrace \ --disable-systemtap \ - --disable-coverage + --disable-coverage \ + --with-libiconv=no \ + --with-threads=posix \ + --with-pcre=internal $(STATEDIR)/host-glib.install.post: @$(call targetinfo) |