From 29305d896b0d54c1de34204fd27de19d95e85804 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Jul 2010 18:39:12 +0200 Subject: misc stuff - remove broken patch from silicon motion driver - add mpc package for upcoming gcc 4.5.x update - add /etc/adktarget, which can be used for native targets to identify - add ffplay subpackage --- package/mysql/Makefile | 6 +++--- package/mysql/patches/patch-Makefile_in | 11 +++++++++++ package/mysql/patches/patch-configure | 19 +++++++++---------- package/mysql/patches/patch-include_config_h_in | 21 +++++++++++++++++++++ package/mysql/patches/patch-include_my_global_h | 10 +++++----- package/mysql/patches/patch-include_mysql_h | 12 ++++++++++++ package/mysql/patches/patch-include_mysql_h_pp | 7 +++++++ package/mysql/patches/patch-sql_sql_builtin_cc | 15 +++++++++++++++ 8 files changed, 83 insertions(+), 18 deletions(-) create mode 100644 package/mysql/patches/patch-Makefile_in create mode 100644 package/mysql/patches/patch-include_config_h_in create mode 100644 package/mysql/patches/patch-include_mysql_h create mode 100644 package/mysql/patches/patch-include_mysql_h_pp create mode 100644 package/mysql/patches/patch-sql_sql_builtin_cc (limited to 'package/mysql') diff --git a/package/mysql/Makefile b/package/mysql/Makefile index c0cce1027..033ffebb7 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -4,14 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mysql -PKG_VERSION:= 5.1.41 +PKG_VERSION:= 5.1.48 PKG_RELEASE:= 1 -PKG_MD5SUM:= b5d39e8789174753f3c782959729e68c +PKG_MD5SUM:= d04c54d1cfbd8c6c8650c8d078f885b2 PKG_DESCR:= MySQL client library PKG_SECTION:= db PKG_DEPENDS:= libncurses zlib PKG_BUILDDEP+= ncurses zlib readline -PKG_URL:= http://www.mysql.com +PKG_URL:= http://www.mysql.com/ PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/} PKG_HOST_DEPENDS:= !cygwin diff --git a/package/mysql/patches/patch-Makefile_in b/package/mysql/patches/patch-Makefile_in new file mode 100644 index 000000000..3606a319c --- /dev/null +++ b/package/mysql/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- mysql-5.1.48.orig/Makefile.in 2010-06-03 17:54:43.000000000 +0200 ++++ mysql-5.1.48/Makefile.in 2010-07-13 12:29:09.025919648 +0200 +@@ -1134,7 +1134,7 @@ abi_check_all: $(TEST_PREPROCESSOR_HEADE + do_abi_check: + set -ex; \ + for file in $(abi_headers); do \ +- @CC@ -E -nostdinc -dI \ ++ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/mysql \ + -I$(top_srcdir)/sql \ diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index 0ce1eac1e..1c61d1a01 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,6 @@ ---- mysql-5.1.41.orig/configure Wed Nov 4 19:37:28 2009 -+++ mysql-5.1.41/configure Tue Dec 29 13:28:43 2009 -@@ -46976,198 +46976,15 @@ $as_echo "$as_me: error: unknown endianness +--- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200 ++++ mysql-5.1.48/configure 2010-07-12 22:51:24.267118950 +0200 +@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann esac @@ -177,7 +177,7 @@ - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - +- -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 @@ -195,15 +195,13 @@ -fi - - -- + { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } - # either define HAVE_IB_SOLARIS_ATOMICS or not -@@ -47283,101 +47100,6 @@ _ACEOF - fi +@@ -48581,101 +48398,6 @@ fi done -- + - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5 -$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; } - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not @@ -298,6 +296,7 @@ -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +- - + # this is needed to know which one of atomic_cas_32() or atomic_cas_64() diff --git a/package/mysql/patches/patch-include_config_h_in b/package/mysql/patches/patch-include_config_h_in new file mode 100644 index 000000000..8c39a7c51 --- /dev/null +++ b/package/mysql/patches/patch-include_config_h_in @@ -0,0 +1,21 @@ +--- mysql-5.1.48.orig/include/config.h.in 2010-06-03 17:54:04.000000000 +0200 ++++ mysql-5.1.48/include/config.h.in 2010-07-12 22:52:37.985862985 +0200 +@@ -856,7 +856,7 @@ + /* Define to 1 if you have the `strtoull' function. */ + #undef HAVE_STRTOULL + +-/* Define to 1 if `st_rdev' is member of `struct stat'. */ ++/* Define to 1 if `struct stat' is a member of `st_rdev'. */ + #undef HAVE_STRUCT_STAT_ST_RDEV + + /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use +@@ -1151,6 +1151,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h index 2b262bbb4..847554aae 100644 --- a/package/mysql/patches/patch-include_my_global_h +++ b/package/mysql/patches/patch-include_my_global_h @@ -1,5 +1,5 @@ ---- mysql-5.1.41.orig/include/my_global.h Wed Nov 4 19:28:15 2009 -+++ mysql-5.1.41/include/my_global.h Tue Dec 29 13:39:20 2009 +--- mysql-5.1.48.orig/include/my_global.h 2010-06-03 17:50:27.000000000 +0200 ++++ mysql-5.1.48/include/my_global.h 2010-07-12 22:51:23.369609493 +0200 @@ -18,6 +18,8 @@ #ifndef _global_h #define _global_h @@ -9,7 +9,7 @@ /* InnoDB depends on some MySQL internals which other plugins should not need. This is because of InnoDB's foreign key support, "safe" binlog -@@ -424,7 +426,7 @@ C_MODE_END +@@ -428,7 +430,7 @@ C_MODE_END #ifdef HAVE_FLOAT_H #include #endif @@ -18,7 +18,7 @@ #include /* For fesetround() */ #endif -@@ -454,15 +456,20 @@ C_MODE_END +@@ -458,15 +460,20 @@ C_MODE_END #undef HAVE_ALLOCA #undef HAVE_ALLOCA_H #endif @@ -40,7 +40,7 @@ /* A lot of our programs uses asserts, so better to always include it -@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket; +@@ -883,9 +890,11 @@ typedef SOCKET_SIZE_TYPE size_socket; #endif /* HAVE_FINITE */ #endif /* isfinite */ diff --git a/package/mysql/patches/patch-include_mysql_h b/package/mysql/patches/patch-include_mysql_h new file mode 100644 index 000000000..3d97d4a0a --- /dev/null +++ b/package/mysql/patches/patch-include_mysql_h @@ -0,0 +1,12 @@ +--- mysql-5.1.48.orig/include/mysql.h 2010-06-03 17:50:21.000000000 +0200 ++++ mysql-5.1.48/include/mysql.h 2010-07-13 12:29:46.006089563 +0200 +@@ -44,7 +44,9 @@ extern "C" { + #endif + + #ifndef _global_h /* If not standard header */ ++#ifndef MYSQL_ABI_CHECK + #include ++#endif + #ifdef __LCC__ + #include /* For windows */ + #endif diff --git a/package/mysql/patches/patch-include_mysql_h_pp b/package/mysql/patches/patch-include_mysql_h_pp new file mode 100644 index 000000000..86e643774 --- /dev/null +++ b/package/mysql/patches/patch-include_mysql_h_pp @@ -0,0 +1,7 @@ +--- mysql-5.1.48.orig/include/mysql.h.pp 2010-06-03 17:50:12.000000000 +0200 ++++ mysql-5.1.48/include/mysql.h.pp 2010-07-13 12:30:01.375881071 +0200 +@@ -1,4 +1,3 @@ +-#include + typedef char my_bool; + typedef int my_socket; + #include "mysql_version.h" diff --git a/package/mysql/patches/patch-sql_sql_builtin_cc b/package/mysql/patches/patch-sql_sql_builtin_cc new file mode 100644 index 000000000..785ae0024 --- /dev/null +++ b/package/mysql/patches/patch-sql_sql_builtin_cc @@ -0,0 +1,15 @@ +--- mysql-5.1.48.orig/sql/sql_builtin.cc 2010-06-03 17:57:58.000000000 +0200 ++++ mysql-5.1.48/sql/sql_builtin.cc 2010-07-12 22:52:33.577118523 +0200 +@@ -18,10 +18,10 @@ + typedef struct st_mysql_plugin builtin_plugin[]; + + extern builtin_plugin +- builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin; ++ builtin_binlog_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin; + + struct st_mysql_plugin *mysqld_builtins[]= + { +- builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin,(struct st_mysql_plugin *)0 ++ builtin_binlog_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin,(struct st_mysql_plugin *)0 + }; + -- cgit v1.2.3