pthread-changes from 1.6 to 1.7?

[Thomas Schlesinger]

Am Mittwoch, 13. September 2006 22:34 schrieb walt:

>
> I'd love to know what the solution is -- could you post the
> patch here, or to my email address?
>

Sure, Joerg's patch is attached.

Thomas
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby18-base/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo	7 Sep 2006 15:40:00 -0000	1.14
+++ distinfo	12 Sep 2006 12:43:23 -0000
@@ -7,5 +7,5 @@
 RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
 Size (ruby-1.8.5.tar.gz) = 4438603 bytes
 SHA1 (patch-aa) = b6b1faedbfcb7df387b56243493fd1d196e2b2e4
-SHA1 (patch-ab) = b2ab7dc336d48a9b72398070e547261a1ac524d4
+SHA1 (patch-ab) = 81c591f90a564d65530652d7b4e2995e1f64aee4
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby18-base/patches/patch-ab,v
retrieving revision 1.6
diff -u -r1.6 patch-ab
--- patches/patch-ab	7 Sep 2006 15:40:01 -0000	1.6
+++ patches/patch-ab	12 Sep 2006 12:43:23 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/09/07 15:40:01 taca Exp $
+$NetBSD$
 
---- configure.orig	2006-08-25 17:34:16.000000000 +0900
+--- configure.orig	2006-08-25 08:34:16.000000000 +0000
 +++ configure
 @@ -11310,13 +11310,21 @@ _ACEOF
  
@@ -47,7 +47,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11377,12 +11385,110 @@ fi
+@@ -11377,14 +11385,112 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
@@ -65,9 +65,9 @@
  cat >>confdefs.h <<_ACEOF
 -#define NORETURN(x) $rb_cv_noreturn
 +#define NORETURN(x) $rb_cv_func_noreturn
-+_ACEOF
-+
-+
+ _ACEOF
+ 
+ 
 +
 +
 +    { echo "$as_me:$LINENO: checking for noinline function attribute" >&5
@@ -98,7 +98,7 @@
 +  ;
 +  return 0;
 +}
- _ACEOF
++_ACEOF
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
@@ -158,9 +158,11 @@
 +
 +
 +
- 
- 
++
++
  { echo "$as_me:$LINENO: checking for RUBY_EXTERN" >&5
+ echo $ECHO_N "checking for RUBY_EXTERN... $ECHO_C" >&6; }
+ if test "${rb_cv_ruby_extern+set}" = set; then
 @@ -11629,6 +11735,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
  		;;
  bsdi*)          LIBS="-lm $LIBS"
@@ -262,7 +264,54 @@
  { echo "$as_me:$LINENO: checking whether right shift preserve sign bit" >&5
  echo $ECHO_N "checking whether right shift preserve sign bit... $ECHO_C" >&6; }
  if test "${rb_cv_rshift_sign+set}" = set; then
-@@ -17849,7 +18042,7 @@ _ACEOF
+@@ -17527,15 +17720,14 @@ _ACEOF
+ 
+ 
+ if test x"$enable_pthread" = xyes; then
+-    for pthread_lib in pthread pthreads c c_r; do
+- 	as_ac_Lib=`echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
+-echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6; }
++ 	as_ac_Lib=`echo "ac_cv_lib_pthread''_pthread_kill" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for pthread_kill in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_kill in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$pthread_lib  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -17613,8 +17805,6 @@ else
+   rb_with_pthread=no
+ fi
+ 
+-	if test "$rb_with_pthread" = "yes"; then break; fi
+-    done
+     if test x"$rb_with_pthread" = xyes; then
+ 	cat >>confdefs.h <<\_ACEOF
+ #define _REENTRANT 1
+@@ -17628,16 +17818,7 @@ _ACEOF
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-	case $pthread_lib in
+-	c)
+-	    ;;
+-	c_r)
+-	    MAINLIBS="-pthread $MAINLIBS"
+-	    ;;
+-	*)
+-      	    LIBS="-l$pthread_lib $LIBS"
+-	    ;;
+-	esac
++      	LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+     else
+ 	{ echo "$as_me:$LINENO: WARNING: \"Don't know how to find pthread library on your system -- thread support disabled\"" >&5
+ echo "$as_me: WARNING: \"Don't know how to find pthread library on your system -- thread support disabled\"" >&2;}
+@@ -17849,7 +18030,7 @@ _ACEOF
      fi
  fi
  if test x"$ac_cv_header_ucontext_h" = xyes; then
@@ -271,7 +320,7 @@
  
  
  for ac_func in getcontext setcontext
-@@ -18149,6 +18342,13 @@ echo $ECHO_N "checking whether OS depend
+@@ -18149,6 +18330,13 @@ echo $ECHO_N "checking whether OS depend
  			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
  			fi
  			rb_cv_dlopen=yes ;;
@@ -285,7 +334,7 @@
  	interix*) 	: ${LDSHARED="$CC -shared"}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
  			LIBPATHFLAG=" -L'%1\$-s'"
-@@ -19007,6 +19207,14 @@ if test "$enable_shared" = 'yes'; then
+@@ -19007,6 +19195,14 @@ if test "$enable_shared" = 'yes'; then
  	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
  	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
  	;;