summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-05-31 09:04:28 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-05-31 09:04:28 +0000
commitd7604705161f579fb9a128d12bb29fd0889cd8d5 (patch)
treea594fbc59de2b3fe7c7249b1ec28013bf9f17cc7 /rules
parent6acd234cfed1f02ab1674660b5bf5ffce4a4ec5f (diff)
downloadptxdist-d7604705161f579fb9a128d12bb29fd0889cd8d5.tar.gz
ptxdist-d7604705161f579fb9a128d12bb29fd0889cd8d5.tar.xz
[dbus-glib] version bump to 0.80
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10624 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/dbus-glib.make15
-rw-r--r--rules/host-dbus-glib.make6
2 files changed, 10 insertions, 11 deletions
diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make
index d68920c4a..4198189a8 100644
--- a/rules/dbus-glib.make
+++ b/rules/dbus-glib.make
@@ -2,6 +2,7 @@
# $Id: template 6655 2007-01-02 12:55:21Z rsc $
#
# Copyright (C) 2007 by Robert Schwebel
+# 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -17,7 +18,7 @@ PACKAGES-$(PTXCONF_DBUS_GLIB) += dbus-glib
#
# Paths and names
#
-DBUS_GLIB_VERSION := 0.78
+DBUS_GLIB_VERSION := 0.80
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)
@@ -45,10 +46,11 @@ DBUS_GLIB_ENV := $(CROSS_ENV)
# use = here, not :=
DBUS_GLIB_AUTOCONF = \
$(CROSS_AUTOCONF_USR) \
- --disable-tests \
+ --disable-bash-completion \
--disable-doxygen-docs \
--disable-gcov \
--disable-gtk-doc \
+ --disable-tests \
--with-dbus-binding-tool=$(PTXCONF_SYSROOT_HOST)/bin/dbus-binding-tool \
--with-introspect-xml=$(HOST_DBUS_GLIB_DIR)/tools/dbus-bus-introspect.xml
@@ -64,16 +66,11 @@ $(STATEDIR)/dbus-glib.targetinstall:
@$(call install_fixup, dbus-glib,PRIORITY,optional)
@$(call install_fixup, dbus-glib,VERSION,$(DBUS_GLIB_VERSION))
@$(call install_fixup, dbus-glib,SECTION,base)
- @$(call install_fixup, dbus-glib,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+ @$(call install_fixup, dbus-glib,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, dbus-glib,DEPENDS,)
@$(call install_fixup, dbus-glib,DESCRIPTION,missing)
- @$(call install_copy, dbus-glib, 0, 0, 0755, \
- $(PKGDIR)/$(DBUS_GLIB)/usr/bin/dbus-binding-tool, \
- /usr/bin/dbus-binding-tool)
-
- @$(call install_copy, dbus-glib, 0, 0, 0644, \
- $(PKGDIR)/$(DBUS_GLIB)/usr/lib/libdbus-glib-1.so.2.1.0, \
+ @$(call install_copy, dbus-glib, 0, 0, 0644, -, \
/usr/lib/libdbus-glib-1.so.2.1.0)
@$(call install_link, dbus-glib, libdbus-glib-1.so.2.1.0, \
/usr/lib/libdbus-glib-1.so.2)
diff --git a/rules/host-dbus-glib.make b/rules/host-dbus-glib.make
index 39faff947..1cdd937f0 100644
--- a/rules/host-dbus-glib.make
+++ b/rules/host-dbus-glib.make
@@ -2,6 +2,7 @@
# $Id$
#
# Copyright (C) 2007 by Robert Schwebel
+# 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -50,10 +51,11 @@ HOST_DBUS_GLIB_ENV := $(HOST_ENV)
#
HOST_DBUS_GLIB_AUTOCONF := \
$(HOST_AUTOCONF) \
- --disable-tests \
+ --disable-bash-completion \
--disable-doxygen-docs \
--disable-gcov \
- --disable-gtk-doc
+ --disable-gtk-doc \
+ --disable-tests
# ----------------------------------------------------------------------------
# Clean