Patchwork p11-kit: fix build against linuxthreads

login
register
mail settings
Submitter Baruch Siach
Date May 5, 2014, 10:34 a.m.
Message ID <ba5ce10c7316baaa811856f944dd3d2139aa2a0f.1399286088.git.baruch@tkos.co.il>
Download mbox | patch
Permalink /patch/345657/
State Accepted
Commit 4d7249bdee218b95556b2835f358a9da4f7dcc67
Headers show

Comments

Baruch Siach - May 5, 2014, 10:34 a.m.
Fixes:
http://autobuild.buildroot.net/results/9e9/9e9c83461fec44c85919e07a3ce2c5ca49ff9cf5/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 ...ld-against-older-pthreads-implementations.patch | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 package/p11-kit/p11-kit-01-Fix-build-against-older-pthreads-implementations.patch
Peter Korsgaard - May 11, 2014, 8:46 p.m.
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/9e9/9e9c83461fec44c85919e07a3ce2c5ca49ff9cf5/

 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed, thanks.

Patch

diff --git a/package/p11-kit/p11-kit-01-Fix-build-against-older-pthreads-implementations.patch b/package/p11-kit/p11-kit-01-Fix-build-against-older-pthreads-implementations.patch
new file mode 100644
index 000000000000..3562f3c2b6be
--- /dev/null
+++ b/package/p11-kit/p11-kit-01-Fix-build-against-older-pthreads-implementations.patch
@@ -0,0 +1,64 @@ 
+From 05b6a7550756ffdced25a6c51cf2222bad9e59e7 Mon Sep 17 00:00:00 2001
+Message-Id: <05b6a7550756ffdced25a6c51cf2222bad9e59e7.1399285491.git.baruch@tkos.co.il>
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Mon, 5 May 2014 09:32:23 +0300
+Subject: [PATCH] Fix build against older pthreads implementations
+
+Older pthreads implementations like glibc NPTL prior to version 2.12, and
+uClibc linuxthreads (both), need _XOPEN_SOURCE to expose
+pthread_mutexattr_settype() and THREAD_MUTEX_DEFAULT. The value 600 (SuSv3,
+POSIX.1-2001) is equivalent to _POSIX_C_SOURCE 200112L.
+
+Fixes the following build error:
+
+  CC       compat.lo
+compat.c: In function 'p11_mutex_init':
+compat.c:164:2: warning: implicit declaration of function 'pthread_mutexattr_settype' [-Wimplicit-function-declaration]
+compat.c:164:2: warning: nested extern declaration of 'pthread_mutexattr_settype' [-Wnested-externs]
+compat.c:164:36: error: 'PTHREAD_MUTEX_DEFAULT' undeclared (first use in this function)
+
+Patch status: sent upstream
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ common/compat.h  | 6 ++++++
+ common/message.c | 6 ------
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/common/compat.h b/common/compat.h
+index d7fe414a46bf..fbc1dc1d4f0f 100644
+--- a/common/compat.h
++++ b/common/compat.h
+@@ -37,6 +37,12 @@
+ 
+ #include "config.h"
+ 
++/*
++ * Oh god. glibc is nasty. Changes behavior and definitions of POSIX
++ * functions to completely different signatures depending on defines
++ */
++#define _XOPEN_SOURCE 600
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+diff --git a/common/message.c b/common/message.c
+index 35f2764487a9..e68dfac561c8 100644
+--- a/common/message.c
++++ b/common/message.c
+@@ -37,12 +37,6 @@
+ 
+ #include "config.h"
+ 
+-/*
+- * Oh god. glibc is nasty. Changes behavior and definitions of POSIX
+- * functions to completely different signatures depending on defines
+- */
+-#define _POSIX_C_SOURCE 200112L
+-
+ #include "compat.h"
+ #define P11_DEBUG_FLAG P11_DEBUG_LIB
+ #include "debug.h"
+-- 
+2.0.0.rc0
+