mds/net-mail/zarafa/files/6.40.7.26119/fix-pthread.patch
geos_one 9ef5ed2da0 net-mail/zarafa: Bump
(Portage version: 2.2.0_alpha34-r1/svn/Linux x86_64, RepoMan options: --force)

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2909 6952d904-891a-0410-993b-d76249ca496b
2011-05-26 16:51:05 +00:00

52 lines
2.1 KiB
Diff

diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
@@ -1628,7 +1628,7 @@
elif test "X$arg" = "X-lc_r"; then
case $host in
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc_r directly, use -pthread flag.
+ # Do not include libc_r directly, use -lpthread flag.
continue
;;
esac
@@ -1647,7 +1647,7 @@
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -2150,7 +2150,7 @@
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
@@ -407,7 +407,7 @@
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
fi
# force add pthread in lucene test
-CXXFLAGS="$CXXFLAGS -pthread"
+CXXFLAGS="$CXXFLAGS -lpthread"
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
AC_CHECK_LIB(clucene, [open],
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
@@ -561,7 +561,7 @@
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
LIBS=$libs_keep
# because it seems this is better... (gnu c/c++ only?)
-CXXFLAGS="$CXXFLAGS -pthread"
+CXXFLAGS="$CXXFLAGS -lpthread"
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
libs_keep=$LIBS