Merge pull request #3202 from pullmoll/libdbus-c++

libdbus-c++: unbreak musl
This commit is contained in:
Juan RP 2015-12-21 09:11:25 +01:00
commit ff085531d6
4 changed files with 43 additions and 1 deletions

View file

@ -0,0 +1,18 @@
Use a portable way to initialize a recursive mutex.
--- src/eventloop.cpp 2011-11-28 16:03:19.000000000 +0100
+++ src/eventloop.cpp 2015-12-20 11:17:56.774568824 +0100
@@ -85,8 +85,11 @@
{
if (recursive)
{
- pthread_mutex_t recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
- _mutex = recmutex;
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init(&attr);
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&_mutex, &attr);
+ pthread_mutexattr_destroy(&attr);
}
else
{

View file

@ -0,0 +1,11 @@
--- include/dbus-c++/pipe.h 2011-11-28 16:03:19.000000000 +0100
+++ include/dbus-c++/pipe.h 2015-12-20 11:28:15.238535382 +0100
@@ -29,6 +29,8 @@
/* STD */
#include <cstdlib>
+/* ssize_t */
+#include <fcntl.h>
namespace DBus
{

View file

@ -0,0 +1,13 @@
--- tools/generate_proxy.cpp 2011-11-28 16:03:19.000000000 +0100
+++ tools/generate_proxy.cpp 2015-12-20 11:30:56.002526689 +0100
@@ -26,6 +26,10 @@
#include <cstdlib>
#include <algorithm>
+#if !defined(__GLIBC__)
+typedef unsigned int uint;
+#endif
+
#include "generator_utils.h"
#include "generate_proxy.h"

View file

@ -1,7 +1,7 @@
# Template file for 'libdbus-c++'
pkgname=libdbus-c++
version=0.9.0
revision=2
revision=3
build_style=gnu-configure
configure_args="--enable-glib --disable-ecore"
hostmakedepends="autoconf automake pkg-config"