changeset 2647:0c267ecd6ee6

package dbus: misc improvements
author Mark Brand <mabrand@mabrand.nl>
date Thu, 28 Jun 2012 22:10:53 +0200
parents 1636938f55e2
children c740cf4f85e0
files src/dbus-1-fixes.patch src/dbus.mk
diffstat 2 files changed, 2 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/dbus-1-fixes.patch	Wed Jun 27 22:29:24 2012 +0200
+++ b/src/dbus-1-fixes.patch	Thu Jun 28 22:10:53 2012 +0200
@@ -3,32 +3,10 @@
 
 Contains ad hoc patches for cross building.
 
-From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Tue, 4 Jan 2011 00:47:49 +0100
-Subject: [PATCH 1/2] always static in MXE
-
-
-diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
-index dcd3eeb..8324278 100644
---- a/dbus/dbus-macros.h
-+++ b/dbus/dbus-macros.h
-@@ -172,6 +172,7 @@
-  */
- 
- #if defined(_WIN32)
-+#  define DBUS_STATIC_BUILD
- #  if defined(DBUS_STATIC_BUILD)
- #  define DBUS_EXPORT
- #  elif defined(dbus_1_EXPORTS)
--- 
-1.7.6.3
-
-
 From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001
 From: MXE
 Date: Fri, 23 Sep 2011 16:24:46 +0200
-Subject: [PATCH 2/2] add missing MemoryBarrier (MXE specific)
+Subject: [PATCH 1/1] add missing MemoryBarrier (MXE specific)
 
 Windows API has this, but it's not in MinGW.
 See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
--- a/src/dbus.mk	Wed Jun 27 22:29:24 2012 +0200
+++ b/src/dbus.mk	Thu Jun 28 22:10:53 2012 +0200
@@ -26,6 +26,7 @@
         --disable-verbose-mode \
         --disable-asserts \
         --disable-shared \
+        --disable-maintainer-mode \
         --enable-static \
         --disable-silent-rules
     $(MAKE) -C '$(1)' -j '$(JOBS)' install