Author: pebender
Date: Fri May 1 21:46:21 2009
New Revision: 4689
Added:
trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.34-cross.patch
trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.34-perl.patch.gar
Removed:
trunk/gar-minimyth/script/db/mysql/files/mysql-5.0.77-configure.patch
trunk/gar-minimyth/script/db/mysql/files/mysql-5.0.77-cross.patch
trunk/gar-minimyth/script/db/mysql/files/mysql-5.0.77-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
Log:
- Updated package db/mysql.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri May 1
21:46:21 2009
@@ -31,6 +31,7 @@
Added nvidia/nvidia-180.51.
Updated packages
+ Updated db/mysql.
Updated devel/gcc.
Updated devel/gcc-minimyth-shared.
Updated devel/gcc-minimyth-static.
Modified: trunk/gar-minimyth/html/minimyth/document-todo.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-todo.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-todo.txt Fri May 1 21:46:21
2009
@@ -27,7 +27,6 @@
<http://www.minimyth.org/forum/viewtopic.php?t=2210>.
Packages we may update:
- db/mysql - 5.1.x - need to update patches.
emulators/fceu - 2.0.x - requires SCons to build.
xorg-7.3/libX11 - 1.2 - need to figure out why X
transport
is broken.
Modified: trunk/gar-minimyth/script/db/mysql/Makefile
==============================================================================
--- trunk/gar-minimyth/script/db/mysql/Makefile (original)
+++ trunk/gar-minimyth/script/db/mysql/Makefile Fri May 1 21:46:21 2009
@@ -1,11 +1,11 @@
GARNAME = mysql
-GARVERSION = 5.0.77
+GARVERSION = 5.1.34
CATEGORIES = db
-MASTER_SITES = http://downloads.mysql.com/archives/$(GARNAME)-5.0/
-MASTER_SITES +=
http://mirror.trouble-free.net/mysql_mirror/Downloads/MySQL-5.0/
-MASTER_SITES += http://mysql.mirror.redwire.net/Downloads/MySQL-5.0/
+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 $(DISTNAME)-configure.patch
+PATCHFILES = $(DISTNAME)-perl.patch.gar
ifneq ($(DESTIMG),build)
PATCHFILES += $(DISTNAME)-cross.patch
endif
@@ -29,6 +29,7 @@
endif
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
+ --cache-file=config.cache \
--enable-shared \
--disable-static \
--enable-thread-safe-client \
@@ -39,11 +40,15 @@
--without-docs \
--without-bench
-CONFIGURE_ENV = $(shell cat $(WORKDIR)/config.cache.$(GARCH_FAMILY))
+#CONFIGURE_ENV = $(shell cat $(WORKDIR)/config.cache.$(GARCH_FAMILY))
GAR_EXTRA_CONF += devel/glibc/package-api.mk
include ../../gar.mk
+extract-config.cache.$(GARCH_FAMILY):
+ @cp $(DOWNLOADDIR)/config.cache.$(GARCH_FAMILY) $(WORKSRC)/config.cache
+ @$(MAKECOOKIE)
+
pre-configure:
@cd $(WORKSRC) ; autoreconf --verbose --install --force
@$(call FIX_LIBTOOL,$(WORKSRC),configure)
@@ -56,6 +61,13 @@
post-install:
@$(call GLIBC_ADD_LIB_PATH, $(libdir)/mysql)
+ @rm -f $(DESTDIR)$(libdir)/mysql/libmysqlclient.la
+ @rm -f $(DESTDIR)$(libdir)/mysql/libmysqlclient_r.la
+ @rm -f $(DESTDIR)$(libdir)/mysql/plugin/ha_archive.la
+ @rm -f $(DESTDIR)$(libdir)/mysql/plugin/ha_blackhole.la
+ @rm -f $(DESTDIR)$(libdir)/mysql/plugin/ha_example.la
+ @rm -f $(DESTDIR)$(libdir)/mysql/plugin/ha_federated.la
+ @rm -f $(DESTDIR)$(libdir)/mysql/plugin/ha_innodb.la
@rm -f $(DESTDIR)$(libdir)/mysql/libdbug.a
@rm -f $(DESTDIR)$(libdir)/mysql/libheap.a
@rm -f $(DESTDIR)$(libdir)/mysql/libmyisam.a
@@ -63,8 +75,6 @@
@rm -f $(DESTDIR)$(libdir)/mysql/libmystrings.a
@rm -f $(DESTDIR)$(libdir)/mysql/libmysys.a
@rm -f $(DESTDIR)$(libdir)/mysql/libvio.a
- @rm -f $(DESTDIR)$(libdir)/mysql/libmysqlclient.la
- @rm -f $(DESTDIR)$(libdir)/mysql/libmysqlclient_r.la
@$(MAKECOOKIE)
clean-all:
Modified: trunk/gar-minimyth/script/db/mysql/checksums
==============================================================================
--- trunk/gar-minimyth/script/db/mysql/checksums (original)
+++ trunk/gar-minimyth/script/db/mysql/checksums Fri May 1 21:46:21 2009
@@ -1,6 +1,5 @@
-6c30a20c9059daf053a301e927eb1667 download/mysql-5.0.77.tar.gz
-732b3822244ddbb1e0f643695be5667f download/mysql-5.0.77-perl.patch.gar
-50922147bedca9b3fc3d3e6f3002bd0b download/mysql-5.0.77-configure.patch
-7c8afe41f2497621bd14dff89b208a55 download/mysql-5.0.77-cross.patch
-db355e84adafb1f1a4701cfcb865160d download/config.cache.i386
-db355e84adafb1f1a4701cfcb865160d download/config.cache.x86_64
+42493187729677cf8f77faeeebd5b3c2 download/mysql-5.1.34.tar.gz
+7e111154233260cdef82cada1ccf2da2 download/mysql-5.1.34-perl.patch.gar
+4152e0e27640726ef716b0ea08e22ec7 download/mysql-5.1.34-cross.patch
+adbb387032d4e464ed2e81db48f38bd3 download/config.cache.i386
+adbb387032d4e464ed2e81db48f38bd3 download/config.cache.x86_64
Modified: trunk/gar-minimyth/script/db/mysql/files/config.cache.i386
==============================================================================
--- trunk/gar-minimyth/script/db/mysql/files/config.cache.i386 (original)
+++ trunk/gar-minimyth/script/db/mysql/files/config.cache.i386 Fri May 1
21:46:21 2009
@@ -1,3 +1,2 @@
-mysql_sprintf_return_type="int"
+ac_cv_c_stack_direction=-1
ac_cv_sys_restartable_syscalls=yes
-ac_cv_conv_longlong_to_float=yes
Modified: trunk/gar-minimyth/script/db/mysql/files/config.cache.x86_64
==============================================================================
--- trunk/gar-minimyth/script/db/mysql/files/config.cache.x86_64
(original)
+++ trunk/gar-minimyth/script/db/mysql/files/config.cache.x86_64 Fri May
1
21:46:21 2009
@@ -1,3 +1,2 @@
-mysql_sprintf_return_type="int"
+ac_cv_c_stack_direction=-1
ac_cv_sys_restartable_syscalls=yes
-ac_cv_conv_longlong_to_float=yes
Added: trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.34-cross.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.34-cross.patch Fri
May 1 21:46:21 2009
@@ -0,0 +1,48 @@
+diff -Naur mysql-5.1.34-old/extra/Makefile.am
mysql-5.1.34-new/extra/Makefile.am
+--- mysql-5.1.34-old/extra/Makefile.am 2009-03-31 07:35:41.000000000 -0700
++++ mysql-5.1.34-new/extra/Makefile.am 2009-05-01 02:49:07.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.34-old/extra/Makefile.in
mysql-5.1.34-new/extra/Makefile.in
+--- mysql-5.1.34-old/extra/Makefile.in 2009-03-31 07:46:53.000000000 -0700
++++ mysql-5.1.34-new/extra/Makefile.in 2009-05-01 02:49:07.000000000 -0700
+@@ -928,7 +928,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.34-old/sql/Makefile.am
mysql-5.1.34-new/sql/Makefile.am
+--- mysql-5.1.34-old/sql/Makefile.am 2009-03-31 07:39:43.000000000 -0700
++++ mysql-5.1.34-new/sql/Makefile.am 2009-05-01 02:49:07.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.34-old/sql/Makefile.in
mysql-5.1.34-new/sql/Makefile.in
+--- mysql-5.1.34-old/sql/Makefile.in 2009-03-31 07:47:03.000000000 -0700
++++ mysql-5.1.34-new/sql/Makefile.in 2009-05-01 02:49:07.000000000 -0700
+@@ -1294,7 +1294,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
Added: trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.34-perl.patch.gar
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.34-perl.patch.gar
Fri May 1 21:46:21 2009
@@ -0,0 +1,45 @@
+diff -Naur mysql-5.1.34-old/mysql-test/mysql-stress-test.pl
mysql-5.1.34-new/mysql-test/mysql-stress-test.pl
+--- mysql-5.1.34-old/mysql-test/mysql-stress-test.pl 2009-03-31
07:36:12.000000000 -0700
++++ mysql-5.1.34-new/mysql-test/mysql-stress-test.pl 2009-05-01
02:33:47.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+ # ======================================================================
+ # MySQL server stress test system
+ # ======================================================================
+diff -Naur mysql-5.1.34-old/mysql-test/mysql-test-run.pl
mysql-5.1.34-new/mysql-test/mysql-test-run.pl
+--- mysql-5.1.34-old/mysql-test/mysql-test-run.pl 2009-03-31
07:36:12.000000000 -0700
++++ mysql-5.1.34-new/mysql-test/mysql-test-run.pl 2009-05-01
02:33:47.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+ # -*- cperl -*-
+
+ #
+diff -Naur mysql-5.1.34-old/mysql-test/suite/funcs_1/lib/DataGen_local.pl
mysql-5.1.34-new/mysql-test/suite/funcs_1/lib/DataGen_local.pl
+--- mysql-5.1.34-old/mysql-test/suite/funcs_1/lib/DataGen_local.pl
2009-03-31 08:28:15.000000000 -0700
++++ mysql-5.1.34-new/mysql-test/suite/funcs_1/lib/DataGen_local.pl
2009-05-01 02:33:47.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.34-old/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
mysql-5.1.34-new/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
+--- mysql-5.1.34-old/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
2009-03-31 08:28:15.000000000 -0700
++++ mysql-5.1.34-new/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
2009-05-01 02:33:47.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.34-old/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-5.1.34-new/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
+--- mysql-5.1.34-old/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
2009-03-31 08:28:45.000000000 -0700
++++ mysql-5.1.34-new/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
2009-05-01 02:33:47.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+...@gar_destdir@@GAR_bindir@/perl
+
+
#################################################################################
+ # Author: Serge Kozlov
#
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
