mail/evolution-data-server

[Sean Boudreau <seanb%qnx.com@localhost>]

Hi:

I don't think mail/evolution-data-server/patches/patch-ak is
behaving as intended.  The base Makefile is passing

CONFIGURE_ENV+=         PTHREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"

but the configure script is setting this to en empty string.
With the patch as is the passed in lib is ignored but
if pthread_create happens to be in libc (empty string as
mentioned above), -lpthread is still set.  Here's what I
think was intended.  This finds -lpthread in NetBSD where
it wasn't before and nothing (libc) on QNX.

Regards,

-seanb

? mail/evolution-data-server/work
Index: mail/evolution-data-server/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution-data-server/distinfo,v
retrieving revision 1.65
diff -u -r1.65 distinfo
--- mail/evolution-data-server/distinfo 13 Apr 2010 16:22:47 -0000      1.65
+++ mail/evolution-data-server/distinfo 14 May 2010 20:43:43 -0000
@@ -4,7 +4,7 @@
 RMD160 (evolution-data-server-2.28.3.1.tar.bz2) = 
11f5c0311de98e590bba73a9a46d33c4d42d8538
 Size (evolution-data-server-2.28.3.1.tar.bz2) = 14461320 bytes
 SHA1 (patch-ab) = fff3e022aee934c463d7a66b681e020d3bebe1b0
-SHA1 (patch-ak) = 45cc217524d484aaad6700326d501db09b5c13a4
+SHA1 (patch-ak) = 7cb93df533fdb942f0605a517f713cfe96401434
 SHA1 (patch-aq) = 375d592b72f59fa70160bf23aa260338d350c517
 SHA1 (patch-ar) = b6b92b068f94954d435cff11543a4de7d07712ac
 SHA1 (patch-at) = 32bb4f9de33a3799ad7a1a00dd072b38a800185c
Index: mail/evolution-data-server/patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution-data-server/patches/patch-ak,v
retrieving revision 1.11
diff -u -r1.11 patch-ak
--- mail/evolution-data-server/patches/patch-ak 21 Oct 2009 17:24:29 -0000      
1.11
+++ mail/evolution-data-server/patches/patch-ak 14 May 2010 20:43:43 -0000
@@ -1,11 +1,12 @@
 $NetBSD: patch-ak,v 1.11 2009/10/21 17:24:29 drochner Exp $
 
---- configure.orig     2009-09-18 12:49:40.000000000 +0200
+--- configure.orig     2010-03-02 06:36:33.000000000 +0000
 +++ configure
-@@ -22379,13 +22379,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
+@@ -22466,14 +22466,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
  
  
-       PTHREAD_LIB=""
+ 
+-      PTHREAD_LIB=""
 -      { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" 
>&5
 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 +      { $as_echo "$as_me:$LINENO: checking for pthread_create in 
${PTHREAD_LIB}" >&5
@@ -19,7 +20,16 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22649,7 +22649,7 @@ fi
+@@ -22533,7 +22532,7 @@ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
+-  PTHREAD_LIB="-lpthread"
++  PTHREAD_LIB="${PTHREAD_LIB}"
+ else
+   { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
+ $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
+@@ -22737,7 +22736,7 @@ fi
  { $as_echo "$as_me:$LINENO: result: 
$ac_cv_lib_pthread___pthread_attr_init_system" >&5
  $as_echo "$ac_cv_lib_pthread___pthread_attr_init_system" >&6; }
  if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then

$NetBSD: patch-ak,v 1.11 2009/10/21 17:24:29 drochner Exp $

--- configure.orig      2010-03-02 06:36:33.000000000 +0000
+++ configure
@@ -22466,14 +22466,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
 
 
 
-       PTHREAD_LIB=""
-       { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" 
>&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+       { $as_echo "$as_me:$LINENO: checking for pthread_create in 
${PTHREAD_LIB}" >&5
+$as_echo_n "checking for pthread_create in ${PTHREAD_LIB}... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="${PTHREAD_LIB}  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22533,7 +22532,7 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
-  PTHREAD_LIB="-lpthread"
+  PTHREAD_LIB="${PTHREAD_LIB}"
 else
   { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
 $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
@@ -22737,7 +22736,7 @@ fi
 { $as_echo "$as_me:$LINENO: result: 
$ac_cv_lib_pthread___pthread_attr_init_system" >&5
 $as_echo "$ac_cv_lib_pthread___pthread_attr_init_system" >&6; }
 if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then
-  PTHREAD_LIB="-lpthread"
+  PTHREAD_LIB="${PTHREAD_LIB}"
 else
   { $as_echo "$as_me:$LINENO: checking for pthread_create" >&5
 $as_echo_n "checking for pthread_create... " >&6; }