Jelajahi Sumber

as the isinf(3) problem is such persistent, take the largest hammer and finally get MySQL building on all platforms, please.

Ralf S. Engelschall 20 tahun lalu
induk
melakukan
1974e6ba2c
2 mengubah file dengan 22 tambahan dan 68 penghapusan
  1. 21 67
      mysql/mysql.patch
  2. 1 1
      mysql/mysql.spec

+ 21 - 67
mysql/mysql.patch

@@ -1,7 +1,7 @@
 Index: include/Makefile.in
---- include/Makefile.in.orig	2005-02-12 21:38:02 +0100
-+++ include/Makefile.in	2005-02-16 20:05:41 +0100
-@@ -328,14 +328,14 @@
+--- include/Makefile.in.orig	2005-08-17 19:07:18.000000000 +0200
++++ include/Makefile.in	2005-10-07 22:33:25.711132965 +0200
+@@ -330,14 +330,14 @@
  			errmsg.h my_global.h my_net.h my_alloc.h \
  			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
  			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
@@ -19,22 +19,24 @@ Index: include/Makefile.in
  			thr_lock.h t_ctype.h violite.h md5.h \
  			mysql_version.h.in my_handler.h my_time.h
  
-Index: mysys/default.c
---- mysys/default.c.orig	2005-02-12 21:37:31 +0100
-+++ mysys/default.c	2005-02-16 20:05:41 +0100
-@@ -48,7 +48,7 @@
- #elif defined(__NETWARE__)
- "sys:/etc/",
- #else
--"/etc/",
-+"@l_prefix@/etc/mysql/",
+Index: include/my_global.h
+--- include/my_global.h.orig	2005-08-17 19:06:28.000000000 +0200
++++ include/my_global.h	2005-10-07 22:58:45.677758340 +0200
+@@ -676,9 +676,8 @@
+ #define FLT_MAX		((float)3.40282346638528860e+38)
  #endif
- #ifdef DATADIR
- DATADIR,
+ 
+-#if !defined(HAVE_ISINF) && !defined(isinf)
++#undef isinf
+ #define isinf(X)    0
+-#endif
+ 
+ /*
+   Max size that must be added to a so that we know Size to make
 Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig	2005-02-12 21:37:31 +0100
-+++ scripts/mysql_config.sh	2005-02-16 20:05:41 +0100
-@@ -85,11 +85,11 @@
+--- scripts/mysql_config.sh.orig	2005-08-17 19:06:30.000000000 +0200
++++ scripts/mysql_config.sh	2005-10-07 22:33:25.711956605 +0200
+@@ -93,11 +93,11 @@
  
  # Create options
  
@@ -49,8 +51,8 @@ Index: scripts/mysql_config.sh
  cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
  include="-I$pkgincludedir"
 Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig	2005-02-14 11:40:14 +0100
-+++ scripts/mysql_create_system_tables.sh	2005-02-16 20:05:41 +0100
+--- scripts/mysql_create_system_tables.sh.orig	2005-08-17 19:06:38.000000000 +0200
++++ scripts/mysql_create_system_tables.sh	2005-10-07 22:33:25.712540957 +0200
 @@ -71,9 +71,6 @@
    c_d="$c_d ) engine=MyISAM"
    c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
@@ -81,51 +83,3 @@ Index: scripts/mysql_create_system_tables.sh
      else
        i_u="$i_u
  	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
-Index: strings/Makefile.in
---- strings/Makefile.in.orig	2005-08-17 19:07:47 +0200
-+++ strings/Makefile.in	2005-09-27 09:57:09 +0200
-@@ -311,7 +311,7 @@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
- CC_VERSION = @CC_VERSION@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -std=c99
- CHECK_PID = @CHECK_PID@
- CHMOD = @CHMOD@
- CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@
-Index: libmysql/Makefile.in
---- libmysql/Makefile.in.orig	2005-08-17 19:07:19.000000000 +0200
-+++ libmysql/Makefile.in	2005-09-27 10:13:02.550981000 +0200
-@@ -190,7 +190,7 @@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
- CC_VERSION = @CC_VERSION@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -std=c99
- CHECK_PID = @CHECK_PID@
- CHMOD = @CHMOD@
- CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@
-Index: libmysql_r/Makefile.in
---- libmysql_r/Makefile.in.orig	2005-08-17 19:07:19.000000000 +0200
-+++ libmysql_r/Makefile.in	2005-09-27 10:13:14.180681000 +0200
-@@ -188,7 +188,7 @@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
- CC_VERSION = @CC_VERSION@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -std=c99
- CHECK_PID = @CHECK_PID@
- CHMOD = @CHMOD@
- CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@
-Index: include/my_global.h
---- include/my_global.h.orig	2005-08-17 19:06:28 +0200
-+++ include/my_global.h	2005-09-28 20:07:41 +0200
-@@ -676,7 +676,7 @@
- #define FLT_MAX		((float)3.40282346638528860e+38)
- #endif
- 
--#if !defined(HAVE_ISINF) && !defined(isinf)
-+#if !defined(HAVE_ISINF)
- #define isinf(X)    0
- #endif
- 

+ 1 - 1
mysql/mysql.spec

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