mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 02:46:28 +00:00
7c951ede31
Add patch to fix linking against libpthread (from Fedora). https://bugzilla.redhat.com/show_bug.cgi?id=1037707 https://bugs.launchpad.net/libmemcached/+bug/1281907 This fixes (upcoming) libmemcached use in collectd, which currently doesn't work because of link failure caused by missing "pthread_once" symbol.
20 lines
723 B
Diff
20 lines
723 B
Diff
diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh
|
|
--- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100
|
|
+++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100
|
|
@@ -5664,6 +5664,15 @@ func_mode_link ()
|
|
*" $arg "*) ;;
|
|
* ) func_append new_inherited_linker_flags " $arg" ;;
|
|
esac
|
|
+ # As we are forced to pass -nostdlib to g++ during linking, the option
|
|
+ # -pthread{,s} is not in effect; add the -lpthread to $deplist
|
|
+ # explicitly to link correctly.
|
|
+ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
|
|
+ case "$arg" in
|
|
+ -pthread*) func_append deplibs " -lpthread" ;;
|
|
+ esac
|
|
+ fi
|
|
+
|
|
continue
|
|
;;
|
|
|