Revision: 5417
Author: pebender
Date: Fri Sep  4 14:23:11 2009
Log: - Updated package db/mysql.


http://code.google.com/p/minimyth/source/detail?r=5417

Added:
  /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.38-cross.patch
   
/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.38-have_atomic_pthread_t.patch
  /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.38-perl.patch.gar
Deleted:
  /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.37-cross.patch
  /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.37-perl.patch.gar
Modified:
  /trunk/gar-minimyth/html/minimyth/document-changelog.txt
  /trunk/gar-minimyth/html/minimyth/document-todo.txt
  /trunk/gar-minimyth/script/db/mysql/Makefile
  /trunk/gar-minimyth/script/db/mysql/checksums
  /trunk/gar-minimyth/script/db/mysql/files/config.cache.i386
  /trunk/gar-minimyth/script/db/mysql/files/config.cache.x86_64

=======================================
--- /dev/null
+++ /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.38-cross.patch  Fri  
Sep  4 14:23:11 2009
@@ -0,0 +1,48 @@
+diff -Naur mysql-5.1.38-old/extra/Makefile.am  
mysql-5.1.38-new/extra/Makefile.am
+--- mysql-5.1.38-old/extra/Makefile.am 2009-09-04 12:53:45.000000000 -0700
++++ mysql-5.1.38-new/extra/Makefile.am 2009-09-04 12:54:36.000000000 -0700
+@@ -32,7 +32,7 @@
+ $(top_builddir)/include/mysqld_error.h: comp_err.c \
+                       $(top_srcdir)/sql/share/errmsg.txt
+       $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
+-      $(top_builddir)/extra/comp_err$(EXEEXT) \
++      mysql-comp_err \
+       --charset=$(top_srcdir)/sql/share/charsets \
+       --out-dir=$(top_builddir)/sql/share/ \
+       --header_file=$(top_builddir)/include/mysqld_error.h \
+diff -Naur mysql-5.1.38-old/extra/Makefile.in  
mysql-5.1.38-new/extra/Makefile.in
+--- mysql-5.1.38-old/extra/Makefile.in 2009-09-04 12:53:45.000000000 -0700
++++ mysql-5.1.38-new/extra/Makefile.in 2009-09-04 12:54:36.000000000 -0700
+@@ -936,7 +936,7 @@
+ $(top_builddir)/include/mysqld_error.h: comp_err.c \
+                       $(top_srcdir)/sql/share/errmsg.txt
+       $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
+-      $(top_builddir)/extra/comp_err$(EXEEXT) \
++      mysql-comp_err$(EXEEXT) \
+       --charset=$(top_srcdir)/sql/share/charsets \
+       --out-dir=$(top_builddir)/sql/share/ \
+       --header_file=$(top_builddir)/include/mysqld_error.h \
+diff -Naur mysql-5.1.38-old/sql/Makefile.am  
mysql-5.1.38-new/sql/Makefile.am
+--- mysql-5.1.38-old/sql/Makefile.am   2009-09-04 12:53:46.000000000 -0700
++++ mysql-5.1.38-new/sql/Makefile.am   2009-09-04 12:54:36.000000000 -0700
+@@ -174,7 +174,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:   gen_lex_hash.cc lex.h
+               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-              ./gen_lex_hash$(EXEEXT) > $...@-t
++              mysql-gen_lex_hash > $...@-t
+               $(MV) $...@-t $@
+
+ # For testing of udf_example.so
+diff -Naur mysql-5.1.38-old/sql/Makefile.in  
mysql-5.1.38-new/sql/Makefile.in
+--- mysql-5.1.38-old/sql/Makefile.in   2009-09-04 12:53:46.000000000 -0700
++++ mysql-5.1.38-new/sql/Makefile.in   2009-09-04 12:54:36.000000000 -0700
+@@ -1302,7 +1302,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:   gen_lex_hash.cc lex.h
+               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-              ./gen_lex_hash$(EXEEXT) > $...@-t
++              mysql-gen_lex_hash > $...@-t
+               $(MV) $...@-t $@
+
+ # We might have some stuff not built in this build, but that we want to  
install
=======================================
--- /dev/null
+++  
/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.38-have_atomic_pthread_t.patch
       
Fri Sep  4 14:23:11 2009
@@ -0,0 +1,37 @@
+diff -Naur mysql-5.1.38-old/storage/innodb_plugin/plug.in  
mysql-5.1.38-new/storage/innodb_plugin/plug.in
+--- mysql-5.1.38-old/storage/innodb_plugin/plug.in     2009-08-21  
05:12:40.000000000 -0700
++++ mysql-5.1.38-new/storage/innodb_plugin/plug.in     2009-09-04  
14:03:23.000000000 -0700
+@@ -63,8 +63,9 @@
+               ;;
+   esac
+   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
+-  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
+-  AC_TRY_RUN(
++  AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
++                 [ac_cv_have_decl_HAVE_ATOMIC_PTHREAD_T],
++  [AC_TRY_RUN(
+     [
+       #include <pthread.h>
+       #include <string.h>
+@@ -84,14 +85,18 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1],
+-                [pthread_t can be used by GCC atomic builtins])
+       AC_MSG_RESULT(yes)
++      ac_cv_have_decl_HAVE_ATOMIC_PTHREAD_T=yes
+     ],
+     [
+       AC_MSG_RESULT(no)
++      ac_cv_have_decl_HAVE_ATOMIC_PTHREAD_T=no
+     ]
+-    )
++    )])
++    if test "x$ac_cv_have_decl_HAVE_ATOMIC_PTHREAD"= "xyes" ; then
++      AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1],
++                [pthread_t can be used by GCC atomic builtins])
++    fi
+
+   # Try using solaris atomics on SunOS if GCC atomics are not available
+   AC_CHECK_DECLS(
=======================================
--- /dev/null
+++ /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.38-perl.patch.gar       
 
Fri Sep  4 14:23:11 2009
@@ -0,0 +1,45 @@
+diff -Naur mysql-5.1.38-old/mysql-test/mysql-stress-test.pl  
mysql-5.1.38-new/mysql-test/mysql-stress-test.pl
+--- mysql-5.1.38-old/mysql-test/mysql-stress-test.pl   2009-08-21  
05:09:42.000000000 -0700
++++ mysql-5.1.38-new/mysql-test/mysql-stress-test.pl   2009-09-04  
12:53:55.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+ # ======================================================================
+ #                     MySQL server stress test system
+ # ======================================================================
+diff -Naur mysql-5.1.38-old/mysql-test/mysql-test-run.pl  
mysql-5.1.38-new/mysql-test/mysql-test-run.pl
+--- mysql-5.1.38-old/mysql-test/mysql-test-run.pl      2009-08-21  
05:09:42.000000000 -0700
++++ mysql-5.1.38-new/mysql-test/mysql-test-run.pl      2009-09-04  
12:53:55.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+ # -*- cperl -*-
+
+ #
+diff -Naur mysql-5.1.38-old/mysql-test/suite/funcs_1/lib/DataGen_local.pl  
mysql-5.1.38-new/mysql-test/suite/funcs_1/lib/DataGen_local.pl
+--- mysql-5.1.38-old/mysql-test/suite/funcs_1/lib/DataGen_local.pl      
2009-08-21 05:48:06.000000000 -0700
++++ mysql-5.1.38-new/mysql-test/suite/funcs_1/lib/DataGen_local.pl      
2009-09-04 12:53:55.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+
+
+ if ( (scalar(@ARGV) != 1 ) || ($ARGV[0] =~ /[^0-9]/i ) )
+diff -Naur mysql-5.1.38-old/mysql-test/suite/funcs_1/lib/DataGen_modify.pl  
mysql-5.1.38-new/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
+--- mysql-5.1.38-old/mysql-test/suite/funcs_1/lib/DataGen_modify.pl     
2009-08-21 05:48:06.000000000 -0700
++++ mysql-5.1.38-new/mysql-test/suite/funcs_1/lib/DataGen_modify.pl     
2009-09-04 12:53:55.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+
+
+ if ( (scalar(@ARGV) != 2 ) || ($ARGV[0] =~ /[^0-9]/i ) )
+diff -Naur  
mysql-5.1.38-old/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl  
mysql-5.1.38-new/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
+--- mysql-5.1.38-old/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl   
2009-08-21 05:48:22.000000000 -0700
++++ mysql-5.1.38-new/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl   
2009-09-04 12:53:55.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+
+  
#################################################################################
+ # Author:  Serge Kozlov                                                       
        #
=======================================
--- /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.37-cross.patch  Mon  
Aug  3 11:55:10 2009
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur mysql-5.1.37-old/extra/Makefile.am  
mysql-5.1.37-new/extra/Makefile.am
---- mysql-5.1.37-old/extra/Makefile.am 2009-08-03 11:42:37.000000000 -0700
-+++ mysql-5.1.37-new/extra/Makefile.am 2009-08-03 11:43:21.000000000 -0700
-@@ -32,7 +32,7 @@
- $(top_builddir)/include/mysqld_error.h: comp_err.c \
-                       $(top_srcdir)/sql/share/errmsg.txt
-       $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
--      $(top_builddir)/extra/comp_err$(EXEEXT) \
-+      mysql-comp_err \
-       --charset=$(top_srcdir)/sql/share/charsets \
-       --out-dir=$(top_builddir)/sql/share/ \
-       --header_file=$(top_builddir)/include/mysqld_error.h \
-diff -Naur mysql-5.1.37-old/extra/Makefile.in  
mysql-5.1.37-new/extra/Makefile.in
---- mysql-5.1.37-old/extra/Makefile.in 2009-08-03 11:42:37.000000000 -0700
-+++ mysql-5.1.37-new/extra/Makefile.in 2009-08-03 11:43:21.000000000 -0700
-@@ -934,7 +934,7 @@
- $(top_builddir)/include/mysqld_error.h: comp_err.c \
-                       $(top_srcdir)/sql/share/errmsg.txt
-       $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
--      $(top_builddir)/extra/comp_err$(EXEEXT) \
-+      mysql-comp_err$(EXEEXT) \
-       --charset=$(top_srcdir)/sql/share/charsets \
-       --out-dir=$(top_builddir)/sql/share/ \
-       --header_file=$(top_builddir)/include/mysqld_error.h \
-diff -Naur mysql-5.1.37-old/sql/Makefile.am  
mysql-5.1.37-new/sql/Makefile.am
---- mysql-5.1.37-old/sql/Makefile.am   2009-08-03 11:42:37.000000000 -0700
-+++ mysql-5.1.37-new/sql/Makefile.am   2009-08-03 11:43:21.000000000 -0700
-@@ -174,7 +174,7 @@
- # this avoid the rebuild of the built files in a source dist
- lex_hash.h:   gen_lex_hash.cc lex.h
-               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--              ./gen_lex_hash$(EXEEXT) > $...@-t
-+              mysql-gen_lex_hash > $...@-t
-               $(MV) $...@-t $@
-
- # For testing of udf_example.so
-diff -Naur mysql-5.1.37-old/sql/Makefile.in  
mysql-5.1.37-new/sql/Makefile.in
---- mysql-5.1.37-old/sql/Makefile.in   2009-08-03 11:42:37.000000000 -0700
-+++ mysql-5.1.37-new/sql/Makefile.in   2009-08-03 11:43:21.000000000 -0700
-@@ -1300,7 +1300,7 @@
- # this avoid the rebuild of the built files in a source dist
- lex_hash.h:   gen_lex_hash.cc lex.h
-               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
--              ./gen_lex_hash$(EXEEXT) > $...@-t
-+              mysql-gen_lex_hash > $...@-t
-               $(MV) $...@-t $@
-
- # We might have some stuff not built in this build, but that we want to  
install
=======================================
--- /trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.37-perl.patch.gar       
 
Mon Aug  3 11:55:10 2009
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur mysql-5.1.37-old/mysql-test/mysql-stress-test.pl  
mysql-5.1.37-new/mysql-test/mysql-stress-test.pl
---- mysql-5.1.37-old/mysql-test/mysql-stress-test.pl   2009-07-13  
16:09:03.000000000 -0700
-+++ mysql-5.1.37-new/mysql-test/mysql-stress-test.pl   2009-08-03  
11:42:48.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-...@gar_destdir@@GAR_bindir@/perl
- # ======================================================================
- #                     MySQL server stress test system
- # ======================================================================
-diff -Naur mysql-5.1.37-old/mysql-test/mysql-test-run.pl  
mysql-5.1.37-new/mysql-test/mysql-test-run.pl
---- mysql-5.1.37-old/mysql-test/mysql-test-run.pl      2009-07-13  
16:09:03.000000000 -0700
-+++ mysql-5.1.37-new/mysql-test/mysql-test-run.pl      2009-08-03  
11:42:48.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-...@gar_destdir@@GAR_bindir@/perl
- # -*- cperl -*-
-
- #
-diff -Naur mysql-5.1.37-old/mysql-test/suite/funcs_1/lib/DataGen_local.pl  
mysql-5.1.37-new/mysql-test/suite/funcs_1/lib/DataGen_local.pl
---- mysql-5.1.37-old/mysql-test/suite/funcs_1/lib/DataGen_local.pl      
2009-07-13 16:45:22.000000000 -0700
-+++ mysql-5.1.37-new/mysql-test/suite/funcs_1/lib/DataGen_local.pl      
2009-08-03 11:42:48.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-...@gar_destdir@@GAR_bindir@/perl
-
-
- if ( (scalar(@ARGV) != 1 ) || ($ARGV[0] =~ /[^0-9]/i ) )
-diff -Naur mysql-5.1.37-old/mysql-test/suite/funcs_1/lib/DataGen_modify.pl  
mysql-5.1.37-new/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
---- mysql-5.1.37-old/mysql-test/suite/funcs_1/lib/DataGen_modify.pl     
2009-07-13 16:45:22.000000000 -0700
-+++ mysql-5.1.37-new/mysql-test/suite/funcs_1/lib/DataGen_modify.pl     
2009-08-03 11:42:48.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-...@gar_destdir@@GAR_bindir@/perl
-
-
- if ( (scalar(@ARGV) != 2 ) || ($ARGV[0] =~ /[^0-9]/i ) )
-diff -Naur  
mysql-5.1.37-old/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl  
mysql-5.1.37-new/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
---- mysql-5.1.37-old/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl   
2009-07-13 16:45:44.000000000 -0700
-+++ mysql-5.1.37-new/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl   
2009-08-03 11:42:48.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-...@gar_destdir@@GAR_bindir@/perl
-
-  
#################################################################################
- # Author:  Serge Kozlov                                                       
        #
=======================================
--- /trunk/gar-minimyth/html/minimyth/document-changelog.txt    Fri Sep  4  
12:48:52 2009
+++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt    Fri Sep  4  
14:23:11 2009
@@ -69,6 +69,7 @@
      Added xorg-7.4/xcb-util.

  Updated packages
+    Updated db/mysql.
      Updated devel/fakeroot.
      Updated disk/e2fsprogs.
      Updated disk/hdparm.
=======================================
--- /trunk/gar-minimyth/html/minimyth/document-todo.txt Fri Sep  4 12:48:52  
2009
+++ /trunk/gar-minimyth/html/minimyth/document-todo.txt Fri Sep  4 14:23:11  
2009
@@ -1,7 +1,6 @@
  Packages we will not update:
      devel/autoconf                 - 2.64    - fails to compile  
xorg-7.4/xf86-video-radeonhd.
      kde/kdelibs                    - 4.x.x   - not compatible with Qt  
3.3.x (requires Qt 4.3.x).
-    db/mysql                       - 5.1.38  - new pthread_t gcc builtins  
test breaks cross compile.
      xorg-7.4/fixesproto            - 4.1     - requires xextproto 7.1.
      xorg-7.4/xextproto             - 7.1     - not compatible with  
xorg-server 1.6.3.
      xorg-7.4/xf86-video-intel      - 2.8.0   - causes segfaults on vt  
switch.
=======================================
--- /trunk/gar-minimyth/script/db/mysql/Makefile        Mon Aug  3 11:55:10 2009
+++ /trunk/gar-minimyth/script/db/mysql/Makefile        Fri Sep  4 14:23:11 2009
@@ -1,12 +1,13 @@
  GARNAME = mysql
-GARVERSION = 5.1.37
+GARVERSION = 5.1.38
  CATEGORIES = db
  MASTER_SITES  = http://downloads.mysql.com/archives/$(GARNAME)-5.1/
  MASTER_SITES +=  
http://mirror.trouble-free.net/mysql_mirror/Downloads/MySQL-5.1/
  MASTER_SITES += http://mysql.mirror.redwire.net/Downloads/MySQL-5.1/
-DISTFILES = $(DISTNAME).tar.gz config.cache.$(GARCH_FAMILY)
-PATCHFILES  = $(DISTNAME)-perl.patch.gar
+DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES = $(DISTNAME)-have_atomic_pthread_t.patch  
$(DISTNAME)-perl.patch.gar
  ifneq ($(DESTIMG),build)
+DISTFILES += config.cache.$(GARCH_FAMILY)
  PATCHFILES += $(DISTNAME)-cross.patch
  endif
  LICENSE = GPL2
@@ -36,11 +37,8 @@
        --with-gnu-ld \
        --without-debug \
        --with-server \
-       --with-extra-tools \
        --without-docs \
-       --without-bench
-
-#CONFIGURE_ENV = $(shell cat $(WORKDIR)/config.cache.$(GARCH_FAMILY))
+       --without-man \

  GAR_EXTRA_CONF += devel/glibc/package-api.mk
  include ../../gar.mk
=======================================
--- /trunk/gar-minimyth/script/db/mysql/checksums       Mon Aug  3 11:55:10 2009
+++ /trunk/gar-minimyth/script/db/mysql/checksums       Fri Sep  4 14:23:11 2009
@@ -1,5 +1,6 @@
-cbdb8783b053019755ee9196f67ea04c  download/mysql-5.1.37.tar.gz
-97492b96f535e4cc2435862a26bf6db8  download/mysql-5.1.37-perl.patch.gar
-4e8102cff82c34a3a86c298dbb486599  download/mysql-5.1.37-cross.patch
-adbb387032d4e464ed2e81db48f38bd3  download/config.cache.i386
-adbb387032d4e464ed2e81db48f38bd3  download/config.cache.x86_64
+8ee9bb80079bbd09499a28bc57d902e7  download/mysql-5.1.38.tar.gz
+2bac8a500a5f21a7d367d86cce318219   
download/mysql-5.1.38-have_atomic_pthread_t.patch
+1dc3bea65e36c81df08692c163ead889  download/mysql-5.1.38-perl.patch.gar
+c3813ae48c56330eae4f3b487474b603  download/mysql-5.1.38-cross.patch
+9d947633d87a517a9f0ae27913bffab2  download/config.cache.i386
+9d947633d87a517a9f0ae27913bffab2  download/config.cache.x86_64
=======================================
--- /trunk/gar-minimyth/script/db/mysql/files/config.cache.i386 Fri May  1  
21:46:21 2009
+++ /trunk/gar-minimyth/script/db/mysql/files/config.cache.i386 Fri Sep  4  
14:23:11 2009
@@ -1,2 +1,3 @@
  ac_cv_c_stack_direction=-1
+ac_cv_have_decl_HAVE_ATOMIC_PTHREAD_T=yes
  ac_cv_sys_restartable_syscalls=yes
=======================================
--- /trunk/gar-minimyth/script/db/mysql/files/config.cache.x86_64       Fri May 
  
1 21:46:21 2009
+++ /trunk/gar-minimyth/script/db/mysql/files/config.cache.x86_64       Fri Sep 
  
4 14:23:11 2009
@@ -1,2 +1,3 @@
  ac_cv_c_stack_direction=-1
+ac_cv_have_decl_HAVE_ATOMIC_PTHREAD_T=yes
  ac_cv_sys_restartable_syscalls=yes

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to