gamin: fix build with musl
PATCH 1/1 gamin: fix build with musl
musl does not provide the non portable PTHREAD_MUTEX_RECURSIVE_NP. Add a patch removing the assumption the PTHREAD_MUTEX_RECURSIVE_NP is available when 'linux' is defined.
Upstream had no new release since 2008, so there is no much hope of getting this fix applied upstream.
Also, fix the pthread dependency comment. gamin code uses pthread directly.
Fixes:
http://autobuild.buildroot.net/results/3a9/3a9328f384fc648ae61316402a84eaffb175881b/
http://autobuild.buildroot.net/results/69d/69d2a93bc97ab0d70c3acb2f9c9f28612ea95871/
http://autobuild.buildroot.net/results/092/092ac7380beb8ce403a1a6fd8e4176e9234413a3/
--- ...0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch | 20 ++++++++++++++++++++ package/gamin/Config.in | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch new file +20 -0
@@ -0,0 +1,20 @@ +Fix missing PTHREAD_MUTEX_RECURSIVE_NP + +The musl C library does not provide the non portable +PTHREAD_MUTEX_RECURSIVE_NP. Test for PTHREAD_MUTEX_RECURSIVE_NP only. + +Signed-off-by: Baruch Siach <[email protected]> +--- + +diff -Nuar gamin-0.1.10-orig/libgamin/gam_data.c gamin-0.1.10/libgamin/gam_data.c +--- gamin-0.1.10-orig/libgamin/gam_data.c 2007-07-04 16:36:48.000000000 +0300 ++++ gamin-0.1.10/libgamin/gam_data.c 2016-03-01 14:50:18.931696959 +0200 +@@ -470,7 +470,7 @@ + } + if (is_threaded > 0) { + pthread_mutexattr_init(&attr); +-#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP) ++#if defined(PTHREAD_MUTEX_RECURSIVE_NP) + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + #else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
package/gamin/Config.in +1 -1
@@ -1,7 +1,7 @@ config BR2_PACKAGE_GAMIN bool "gamin" depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 help
Signature · 1 line
2.7.0
Thomas Petazzoni
AppliedPATCH 1/1 gamin: fix build with musl
Hello,
Quoted 6 lines · Baruch Siach
musl does not provide the non portable
PTHREAD_MUTEX_RECURSIVE_NP. Add a patch removing the assumption thePTHREAD_MUTEX_RECURSIVE_NPis available when 'linux' is defined.Upstream had no new release since 2008, so there is no much hope of getting this fix applied upstream.
Not quite true :) If you check https://git.gnome.org/browse/gamin/log/,
there has been a commit in early February 2016. Granted, it was the first commit since almost two years, but still. It's worth submitting upstream :-)
Quoted 7 lines
Also, fix the pthread dependency comment. gamin code uses pthread directly.
Fixes:
http://autobuild.buildroot.net/results/3a9/3a9328f384fc648ae61316402a84eaffb175881b/
http://autobuild.buildroot.net/results/69d/69d2a93bc97ab0d70c3acb2f9c9f28612ea95871/
http://autobuild.buildroot.net/results/092/092ac7380beb8ce403a1a6fd8e4176e9234413a3/
Quoted 6 lines
Signed-off-by Baruch Siach <[email protected]>--- ...0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch | 20 ++++++++++++++++++++ package/gamin/Config.in | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 gamin: fix build with musl
Hi Thomas,
Quoted 5 lines · Thomas Petazzoni
Quoted 4 lines · Baruch Siach
musl does not provide the non portable
PTHREAD_MUTEX_RECURSIVE_NP. Add a patch removing the assumption thePTHREAD_MUTEX_RECURSIVE_NPis available when 'linux' is defined.
Quoted 7 lines
Quoted 2 lines
Upstream had no new release since 2008, so there is no much hope of getting this fix applied upstream.
Not quite true :) If you check https://git.gnome.org/browse/gamin/log/,
there has been a commit in early February 2016. Granted, it was the first commit since almost two years, but still. It's worth submitting upstream :-)
Done: https://mail.gnome.org/archives/gamin-list/2016-April/msg00000.html.
First message to the gamin list since July 2013.
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -