Browse Source

try correcting threads and signals definitions problem on Solaris 8

Michael Schloh von Bennewitz 21 years ago
parent
commit
8db2531ea6
2 changed files with 55 additions and 1 deletions
  1. 54 0
      mysql/mysql.patch
  2. 1 1
      mysql/mysql.spec

+ 54 - 0
mysql/mysql.patch

@@ -63,3 +63,57 @@
  #endif
  #ifdef DATADIR
  DATADIR,
+--- config.h.in.orig	2004-12-09 12:21:30.331530371 +0100
++++ config.h.in	2004-12-09 12:21:33.941576868 +0100
+@@ -628,6 +628,9 @@
+ /* Define to 1 if you have the `setupterm' function. */
+ #undef HAVE_SETUPTERM
+ 
++/* Define to 1 if you have the <signal.h> header file. */
++#undef HAVE_SIGNAL_H
++
+ /* Define to 1 if you have the `sighold' function. */
+ #undef HAVE_SIGHOLD
+ 
+--- include/my_pthread.h.orig	2004-10-28 02:48:34.000000000 +0200
++++ include/my_pthread.h	2004-12-09 12:23:37.673149500 +0100
+@@ -229,7 +229,6 @@
+ 
+ #ifdef HAVE_rts_threads
+ #define sigwait org_sigwait
+-#include <signal.h>
+ #undef sigwait
+ #endif
+ #undef _REENTRANT			/* Fix if _REENTRANT is in pthread.h */
+@@ -240,6 +239,9 @@
+ #ifdef HAVE_THR_SETCONCURRENCY
+ #include <thread.h>			/* Probably solaris */
+ #endif
++#ifdef HAVE_SIGNAL_H
++#include <signal.h>
++#endif
+ #ifdef HAVE_SCHED_H
+ #include <sched.h>
+ #endif
+--- configure.in.orig	2004-10-28 02:48:38.000000000 +0200
++++ configure.in	2004-12-09 12:26:09.585078188 +0100
+@@ -735,7 +735,7 @@
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
+- memory.h pwd.h select.h \
++ memory.h pwd.h select.h signal.h \
+  stdlib.h stddef.h \
+  strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
+  sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
+--- configure.orig	2004-10-28 02:48:59.000000000 +0200
++++ configure	2004-12-09 12:22:45.602487633 +0100
+@@ -21408,7 +21408,7 @@
+ 
+ 
+ for ac_header in fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
+- memory.h pwd.h select.h \
++ memory.h pwd.h select.h signal.h \
+  stdlib.h stddef.h \
+  strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
+  sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \

+ 1 - 1
mysql/mysql.spec

@@ -40,7 +40,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20041207
+Release:      20041209
 
 #   package options
 %option       with_server    yes