From 28bfc5688a1a016bef4a001a5bc2a7f7703b1f85 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 Mar 2012 17:47:39 +0100 Subject: allconfig fixes for lemote yeelong --- package/mysql/Makefile | 4 ++-- package/mysql/patches/patch-Makefile_in | 11 ----------- package/mysql/patches/patch-include_mysql_h | 12 ------------ package/mysql/patches/patch-include_mysql_h_pp | 7 ------- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 package/mysql/patches/patch-Makefile_in delete mode 100644 package/mysql/patches/patch-include_mysql_h delete mode 100644 package/mysql/patches/patch-include_mysql_h_pp (limited to 'package/mysql') diff --git a/package/mysql/Makefile b/package/mysql/Makefile index 649151c42..2d85c947a 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mysql -PKG_VERSION:= 5.1.48 +PKG_VERSION:= 5.1.61 PKG_RELEASE:= 1 -PKG_MD5SUM:= d04c54d1cfbd8c6c8650c8d078f885b2 +PKG_MD5SUM:= 4efd10c69c4c99dbdb8fae3834a6d7b8 PKG_DESCR:= MySQL client library PKG_SECTION:= db PKG_DEPENDS:= libncurses zlib diff --git a/package/mysql/patches/patch-Makefile_in b/package/mysql/patches/patch-Makefile_in deleted file mode 100644 index 3606a319c..000000000 --- a/package/mysql/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-include_mysql_h b/package/mysql/patches/patch-include_mysql_h deleted file mode 100644 index 3d97d4a0a..000000000 --- a/package/mysql/patches/patch-include_mysql_h +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 86e643774..000000000 --- a/package/mysql/patches/patch-include_mysql_h_pp +++ /dev/null @@ -1,7 +0,0 @@ ---- 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" -- cgit v1.2.3