summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-06-28 20:10:53 (GMT)
committerMark Brand <mabrand@mabrand.nl>2012-06-28 20:10:59 (GMT)
commita5a329b1eed4edefcf4844019b56a56f38b4b8b7 (patch)
tree65c2ef934866efeffabbddc868771e2a554e96b0
parentf3b077d0c28c17edb356e1364d347e843fe77218 (diff)
downloadmxe-a5a329b1eed4edefcf4844019b56a56f38b4b8b7.zip
mxe-a5a329b1eed4edefcf4844019b56a56f38b4b8b7.tar.gz
mxe-a5a329b1eed4edefcf4844019b56a56f38b4b8b7.tar.bz2
package dbus: misc improvements
-rw-r--r--src/dbus-1-fixes.patch24
-rw-r--r--src/dbus.mk1
2 files changed, 2 insertions, 23 deletions
diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch
index 1e4ac3d..602f169 100644
--- a/src/dbus-1-fixes.patch
+++ b/src/dbus-1-fixes.patch
@@ -3,32 +3,10 @@ See index.html for further information.
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
diff --git a/src/dbus.mk b/src/dbus.mk
index 45fddd6..81c1e2b 100644
--- a/src/dbus.mk
+++ b/src/dbus.mk
@@ -26,6 +26,7 @@ define $(PKG)_BUILD
--disable-verbose-mode \
--disable-asserts \
--disable-shared \
+ --disable-maintainer-mode \
--enable-static \
--disable-silent-rules
$(MAKE) -C '$(1)' -j '$(JOBS)' install