diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-02-24 20:16:30 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-02-28 09:15:04 +0100 |
| commit | 58935bab9cf3fcb7764c02c820f2cd9b8e3fc9af (patch) | |
| tree | 5e3134d4723e3ae44f60fdc18d1d171f69cfa4cf /rules | |
| parent | a50382cb050e0c92f17afbbb37d6d7c1e91de4ae (diff) | |
| download | ptxdist-58935bab9cf3fcb7764c02c820f2cd9b8e3fc9af.tar.gz ptxdist-58935bab9cf3fcb7764c02c820f2cd9b8e3fc9af.tar.xz | |
dbus-glib: version bump 0.100 -> 0.104
Cleanup while at it. Note: '=' is no longer needed, the referenced variable
was removed in an earlier commit.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/dbus-glib.make | 19 | ||||
| -rw-r--r-- | rules/host-dbus-glib.make | 16 |
2 files changed, 17 insertions, 18 deletions
diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make index 056b3c6a5..cfca8cd37 100644 --- a/rules/dbus-glib.make +++ b/rules/dbus-glib.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DBUS_GLIB) += dbus-glib # # Paths and names # -DBUS_GLIB_VERSION := 0.100 -DBUS_GLIB_MD5 := d33959a9c0c6a158f5ac6d640316e89e +DBUS_GLIB_VERSION := 0.104 +DBUS_GLIB_MD5 := 5497d2070709cf796f1878c75a72a039 DBUS_GLIB := dbus-glib-$(DBUS_GLIB_VERSION) DBUS_GLIB_SUFFIX := tar.gz DBUS_GLIB_URL := http://dbus.freedesktop.org/releases/dbus-glib/$(DBUS_GLIB).$(DBUS_GLIB_SUFFIX) @@ -30,20 +30,19 @@ DBUS_GLIB_LICENSE := AFLv2.1, GPLv2+ # Prepare # ---------------------------------------------------------------------------- -DBUS_GLIB_PATH := PATH=$(CROSS_PATH) -DBUS_GLIB_ENV := $(CROSS_ENV) - # # autoconf # -# use = here, not := -DBUS_GLIB_AUTOCONF = \ +DBUS_GLIB_CONF_TOOL := autoconf +DBUS_GLIB_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-bash-completion \ + --disable-tests \ + --disable-ansi \ --disable-gcov \ + --disable-bash-completion \ + --disable-asserts \ + --enable-checks \ --disable-gtk-doc \ - --disable-static \ - --disable-tests \ --with-dbus-binding-tool=$(PTXCONF_SYSROOT_HOST)/bin/dbus-binding-tool \ --with-introspect-xml=$(PTXCONF_SYSROOT_HOST)/share/dbus-glib/dbus-bus-introspect.xml diff --git a/rules/host-dbus-glib.make b/rules/host-dbus-glib.make index 28aa46e4c..e2f5be5e9 100644 --- a/rules/host-dbus-glib.make +++ b/rules/host-dbus-glib.make @@ -23,19 +23,19 @@ HOST_DBUS_GLIB_DIR = $(HOST_BUILDDIR)/$(DBUS_GLIB) # Prepare # ---------------------------------------------------------------------------- -HOST_DBUS_GLIB_PATH := PATH=$(HOST_PATH) -HOST_DBUS_GLIB_ENV := $(HOST_ENV) - # # autoconf # -HOST_DBUS_GLIB_AUTOCONF := \ +HOST_DBUS_GLIB_CONF_TOOL := autoconf +HOST_DBUS_GLIB_CONF_OPT := \ $(HOST_AUTOCONF) \ - --disable-bash-completion \ + --disable-tests \ + --disable-ansi \ --disable-gcov \ - --disable-gtk-doc \ - --disable-static \ - --disable-tests + --disable-bash-completion \ + --disable-asserts \ + --enable-checks \ + --disable-gtk-doc # ---------------------------------------------------------------------------- # Install |