File fix-pthread-in-fuse.pc.patch of Package fuse

Overview Repositories Revisions Requests Users Attributes Meta

File fix-pthread-in-fuse.pc.patch of Package fuse

From 384496dd02cfd9a74b95d62ce0d23a31a7af3730 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Wed, 16 May 2012 16:45:27 +0200
Subject: [PATCH] Fix -pthread in fuse.pc

Linking to a library that uses threads requires the application to be linked
with -pthreads otherwise some pthread functions will be linked to stubs in
glibc.  So move -pthread from Libs.private to Libs in fuse.pc.

Reported by Werner Fink
---
 ChangeLog       |    7 +++++++
 configure.in    |    5 ++---
 fuse.pc.in      |    2 +-
 lib/Makefile.am |    2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

Index: fuse-2.9.0/ChangeLog
===================================================================
--- fuse-2.9.0.orig/ChangeLog	2012-04-20 16:29:19.000000000 +0200
+++ fuse-2.9.0/ChangeLog	2012-07-02 09:29:09.904005554 +0200
@@ -1,3 +1,10 @@
+2012-05-16  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Linking to a library that uses threads requires the application
+	to be linked with -pthreads otherwise some pthread functions will
+	be linked to stubs in glibc.  So move -pthread from Libs.private
+	to Libs in fuse.pc.  Reported by Werner Fink
+
 2012-04-20  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.9.0
Index: fuse-2.9.0/configure.in
===================================================================
--- fuse-2.9.0.orig/configure.in	2012-07-02 09:27:31.886602524 +0200
+++ fuse-2.9.0/configure.in	2012-07-02 09:29:09.915005039 +0200
@@ -62,11 +62,10 @@ AC_CHECK_FUNCS([fork setxattr fdatasync
 AC_CHECK_MEMBERS([struct stat.st_atim])
 AC_CHECK_MEMBERS([struct stat.st_atimespec])
 
-libfuse_libs="-pthread"
 LIBS=
 AC_SEARCH_LIBS(dlopen, [dl])
 AC_SEARCH_LIBS(clock_gettime, [rt])
-libfuse_libs="$libfuse_libs $LIBS"
+libfuse_libs=$LIBS
 LIBS=
 AC_ARG_WITH([libiconv-prefix],
 [  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
@@ -76,7 +75,7 @@ AC_ARG_WITH([libiconv-prefix],
     done
    ])
 AM_ICONV
-libfuse_libs="$libfuse_libs $LTLIBICONV"
+libfuse_libs=$libfuse_libs $LTLIBICONV
 AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
 AC_SUBST(libfuse_libs)
 
Index: fuse-2.9.0/fuse.pc.in
===================================================================
--- fuse-2.9.0.orig/fuse.pc.in	2012-04-10 15:28:55.000000000 +0200
+++ fuse-2.9.0/fuse.pc.in	2012-07-02 09:29:09.915005039 +0200
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: fuse
 Description: Filesystem in Userspace
 Version: @VERSION@
-Libs: -L${libdir} -lfuse
+Libs: -L${libdir} -lfuse -pthread
 Libs.private: @libfuse_libs@
 Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64
Index: fuse-2.9.0/lib/Makefile.am
===================================================================
--- fuse-2.9.0.orig/lib/Makefile.am	2012-04-20 12:01:56.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.am	2012-07-02 09:29:09.916004992 +0200
@@ -36,7 +36,7 @@ libfuse_la_SOURCES = 		\
 	$(iconv_source)		\
 	$(mount_source)
 
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:9:0 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:0 \
 	-Wl,--version-script,$(srcdir)/fuse_versionscript
 
 if NETBSD
Index: fuse-2.9.0/configure
===================================================================
--- fuse-2.9.0.orig/configure	2012-07-02 09:27:54.000000000 +0200
+++ fuse-2.9.0/configure	2012-07-02 09:29:47.969220381 +0200
@@ -12114,7 +12114,6 @@ _ACEOF
 fi
 
 
-libfuse_libs="-pthread"
 LIBS=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
@@ -12228,7 +12227,7 @@ if test "$ac_res" != no; then :
 
 fi
 
-libfuse_libs="$libfuse_libs $LIBS"
+libfuse_libs=$LIBS
 LIBS=
 
 # Check whether --with-libiconv-prefix was given.
@@ -13205,7 +13204,7 @@ _ACEOF
 
   fi
 
-libfuse_libs="$libfuse_libs $LTLIBICONV"
+libfuse_libs=$libfuse_libs $LTLIBICONV
  if test "$am_cv_func_iconv" = yes; then
   ICONV_TRUE=
   ICONV_FALSE='#'
Index: fuse-2.9.0/lib/Makefile.in
===================================================================
--- fuse-2.9.0.orig/lib/Makefile.in	2012-04-20 14:43:38.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.in	2012-07-02 09:29:51.589050623 +0200
@@ -283,7 +283,7 @@ libfuse_la_SOURCES = \
 	$(iconv_source)		\
 	$(mount_source)
 
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:9:0 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:0 \
 	-Wl,--version-script,$(srcdir)/fuse_versionscript
 
 @NETBSD_TRUE@libfuse_la_LIBADD = -lperfuse -lpuffs

Places

File fix-pthread-in-fuse.pc.patch of Package fuse

Places