aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2018-02-07 02:09:56 +0100
committerGitHub <noreply@github.com>2018-02-07 02:09:56 +0100
commitd32596fbbdcee47a2412b4a457a3c329dca7663f (patch)
treed3570da81f5717548397bc5e0edf40e55e1fcfa6
parenta73b842fdde2db7be9929f9b80f1286d0e9a5d42 (diff)
parentafb5717ffdf51e95764aa46029c5764faade7c5a (diff)
Merge pull request #13440 from Rechi/depends/mariadb
[depends] replace mysql with mariadb 3.0.3
-rw-r--r--tools/depends/target/Makefile4
-rw-r--r--tools/depends/target/config.site.in1
-rw-r--r--tools/depends/target/mariadb/01-android.patch60
-rw-r--r--tools/depends/target/mariadb/Makefile35
-rw-r--r--tools/depends/target/mysql/01-mysqlclient-cross-compile.patch170
-rw-r--r--tools/depends/target/mysql/02-mysqlclient-ios.patch27
-rw-r--r--tools/depends/target/mysql/03-mysqlclient-android.patch48
-rw-r--r--tools/depends/target/mysql/04-strnlen.patch43
-rw-r--r--tools/depends/target/mysql/05-mysqlclient-ios64.patch11
-rw-r--r--tools/depends/target/mysql/06-fixsslcheck.patch11
-rw-r--r--tools/depends/target/mysql/07-no-endpwent.patch12
-rw-r--r--tools/depends/target/mysql/Makefile57
12 files changed, 97 insertions, 382 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index df92d8420a..d12313ca99 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -9,7 +9,7 @@ DEPENDS = \
libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
openssl gmp nettle gnutls curl \
libjpeg-turbo libpng fribidi libass \
- libxml2 rapidjson libmicrohttpd mysql libffi \
+ libxml2 rapidjson libmicrohttpd mariadb libffi \
python27 libshairplay libfmt \
libplist libcec libbluray tinyxml \
libssh taglib libusb libnfs \
@@ -95,7 +95,7 @@ libcdio-gplv3: $(ICONV)
libplist: $(ZLIB)
libbluray: $(ICONV) libxml2
libssh: libgcrypt openssl $(ZLIB)
-mysql: openssl $(ZLIB)
+mariadb: openssl $(ICONV) $(ZLIB)
libzip: $(ZLIB)
libpng: $(ZLIB)
openssl: $(ZLIB)
diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in
index 28333d3e0a..3845b59bf3 100644
--- a/tools/depends/target/config.site.in
+++ b/tools/depends/target/config.site.in
@@ -29,7 +29,6 @@ export PKG_CONFIG=@prefix@/@tool_dir@/bin/pkg-config
export PKG_CONFIG_LIBDIR=@prefix@/@deps_dir@/lib/pkgconfig
export YASM=@prefix@/@tool_dir@/bin/yasm
export NASM=@prefix@/@tool_dir@/bin/yasm
-export MYSQL_CONFIG=@prefix@/@deps_dir@/bin/mysql_config
LIBGCRYPT_CONFIG=@prefix@/@deps_dir@/bin/libgcrypt-config
PATH=@prefix@/@tool_dir@/bin:@use_toolchain@/usr/bin:@use_toolchain@/bin:$PATH
diff --git a/tools/depends/target/mariadb/01-android.patch b/tools/depends/target/mariadb/01-android.patch
new file mode 100644
index 0000000000..65ca2d3153
--- /dev/null
+++ b/tools/depends/target/mariadb/01-android.patch
@@ -0,0 +1,60 @@
+--- a/cmake/CheckIncludeFiles.cmake
++++ b/cmake/CheckIncludeFiles.cmake
+@@ -74,3 +74,12 @@
+ CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
+ CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H)
+ CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H)
++IF(HAVE_UCONTEXT_H)
++ CHECK_FUNCTION_EXISTS (getcontext HAVE_GETCONTEXT)
++ CHECK_FUNCTION_EXISTS (makecontext HAVE_MAKECONTEXT)
++ CHECK_FUNCTION_EXISTS (setcontext HAVE_SETCONTEXT)
++ CHECK_FUNCTION_EXISTS (swapcontext HAVE_SWAPCONTEXT)
++ IF(NOT HAVE_GETCONTEXT OR NOT HAVE_MAKECONTEXT OR NOT HAVE_SETCONTEXT OR NOT HAVE_SWAPCONTEXT)
++ SET(HAVE_UCONTEXT_H 0 CACHE INTERNAL "")
++ ENDIF()
++ENDIF(HAVE_UCONTEXT_H)
+--- a/cmake/CheckTypes.cmake
++++ b/cmake/CheckTypes.cmake
+@@ -25,6 +25,7 @@
+ CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T)
+ CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR)
+ CHECK_TYPE_SIZE(uint SIZEOF_UINT)
++CHECK_TYPE_SIZE(ushort SIZEOF_USHORT)
+ CHECK_TYPE_SIZE(ulong SIZEOF_ULONG)
+ CHECK_TYPE_SIZE(int8 SIZEOF_INT8)
+ CHECK_TYPE_SIZE(uint8 SIZEOF_UINT8)
+--- a/include/ma_config.h.in
++++ b/include/ma_config.h.in
+@@ -217,6 +217,11 @@
+ # define HAVE_UINT 1
+ #endif
+
++#cmakedefine SIZEOF_USHORT @SIZEOF_USHORT@
++#if SIZEOF_USHORT
++# define HAVE_USHORT 1
++#endif
++
+ #cmakedefine SIZEOF_ULONG @SIZEOF_ULONG@
+ #if SIZEOF_ULONG
+ # define HAVE_ULONG 1
+--- a/include/ma_global.h
++++ b/include/ma_global.h
+@@ -272,6 +272,8 @@
+
+ #if defined(__EMX__) || !defined(HAVE_UINT)
+ typedef unsigned int uint;
++#endif
++#if defined(__EMX__) || !defined(HAVE_USHORT)
+ typedef unsigned short ushort;
+ #endif
+
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -291,7 +291,6 @@ ELSE()
+ IF(ICONV_INCLUDE_DIR)
+ INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
+ ENDIF()
+- ADD_DEFINITIONS(-DLIBICONV_PLUG)
+ ENDIF()
+
+ IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
diff --git a/tools/depends/target/mariadb/Makefile b/tools/depends/target/mariadb/Makefile
new file mode 100644
index 0000000000..ff810583c1
--- /dev/null
+++ b/tools/depends/target/mariadb/Makefile
@@ -0,0 +1,35 @@
+include ../../Makefile.include
+DEPS= ../../Makefile.include Makefile 01-android.patch
+
+LIBNAME=mariadb
+VERSION=3.0.3
+ARCHIVE=$(LIBNAME)-connector-c-$(VERSION)-src.tar.gz
+
+LIBDYLIB=$(PLATFORM)/build/lib$(LIBNAME)/lib$(LIBNAME)client.a
+
+all: .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+ rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
+ cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ cd $(PLATFORM); patch -p1 -i ../01-android.patch
+ sed -ie 's| "DYNAMIC" | "STATIC" |' $(PLATFORM)/cmake/plugins.cmake
+ cd $(PLATFORM)/build; $(CMAKE) -DAUTH_GSSAPI=OFF -DWITH_UNITTEST:BOOL=OFF -DWITH_EXTERNAL_ZLIB:BOOL=ON -DWITH_CURL:BOOL=OFF ..
+
+$(LIBDYLIB): $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)/build
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+ $(MAKE) -C $(PLATFORM)/build install
+ rm -f $(PREFIX)/lib/mariadb/*.so $(PREFIX)/lib/mariadb/*.dylib
+ touch $@
+
+clean:
+ $(MAKE) -C $(PLATFORM) clean
+ rm -f .installed-$(PLATFORM)
+
+distclean::
+ rm -rf $(PLATFORM) .installed-$(PLATFORM)
diff --git a/tools/depends/target/mysql/01-mysqlclient-cross-compile.patch b/tools/depends/target/mysql/01-mysqlclient-cross-compile.patch
deleted file mode 100644
index 12b22b7e0d..0000000000
--- a/tools/depends/target/mysql/01-mysqlclient-cross-compile.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ruN mysql-5.1.55.org/configure.in mysql-5.1.55/configure.in
---- mysql-5.1.55.org/configure.in 2011-01-25 16:04:35.000000000 +0100
-+++ mysql-5.1.55/configure.in 2011-05-19 20:14:38.000000000 +0200
-@@ -1571,13 +1571,6 @@
- esac
-
-
--# System characteristics
--case $SYSTEM_TYPE in
-- *netware*) ;;
-- *)
--AC_SYS_RESTARTABLE_SYSCALLS
-- ;;
--esac
-
- # Build optimized or debug version ?
- # First check for gcc and g++
-diff -ruN mysql-5.1.55.org/storage/innodb_plugin/plug.in mysql-5.1.55/storage/innodb_plugin/plug.in
---- mysql-5.1.55.org/storage/innodb_plugin/plug.in 2011-01-25 16:04:35.000000000 +0100
-+++ mysql-5.1.55/storage/innodb_plugin/plug.in 2011-05-19 21:59:28.000000000 +0200
-@@ -56,149 +56,6 @@
- esac
- AC_SUBST(INNODB_DYNAMIC_CFLAGS)
-
-- AC_MSG_CHECKING(whether GCC atomic builtins are available)
-- # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
-- AC_TRY_RUN(
-- [
-- int main()
-- {
-- long x;
-- long y;
-- long res;
-- char c;
--
-- x = 10;
-- y = 123;
-- res = __sync_bool_compare_and_swap(&x, x, y);
-- if (!res || x != y) {
-- return(1);
-- }
--
-- x = 10;
-- y = 123;
-- res = __sync_bool_compare_and_swap(&x, x + 1, y);
-- if (res || x != 10) {
-- return(1);
-- }
--
-- x = 10;
-- y = 123;
-- res = __sync_add_and_fetch(&x, y);
-- if (res != 123 + 10 || x != 123 + 10) {
-- return(1);
-- }
--
-- c = 10;
-- res = __sync_lock_test_and_set(&c, 123);
-- if (res != 10 || c != 123) {
-- return(1);
-- }
--
-- return(0);
-- }
-- ],
-- [
-- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
-- [GCC atomic builtins are available])
-- AC_MSG_RESULT(yes)
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
--
-- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
-- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
-- AC_TRY_RUN(
-- [
-- #include <pthread.h>
-- #include <string.h>
--
-- int main(int argc, char** argv) {
-- pthread_t x1;
-- pthread_t x2;
-- pthread_t x3;
--
-- memset(&x1, 0x0, sizeof(x1));
-- memset(&x2, 0x0, sizeof(x2));
-- memset(&x3, 0x0, sizeof(x3));
--
-- __sync_bool_compare_and_swap(&x1, x2, x3);
--
-- return(0);
-- }
-- ],
-- [
-- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
-- [pthread_t can be used by GCC atomic builtins])
-- AC_MSG_RESULT(yes)
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
--
-- AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-- # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
-- # functions are present.
-- AC_CHECK_FUNCS(atomic_add_long_nv \
-- atomic_cas_32 \
-- atomic_cas_64 \
-- atomic_cas_ulong \
-- atomic_swap_uchar)
--
-- if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \
-- "${ac_cv_func_atomic_cas_32}" = "yes" -a \
-- "${ac_cv_func_atomic_cas_64}" = "yes" -a \
-- "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \
-- "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then
--
-- AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-- [Define to 1 if Solaris libc atomic functions are available]
-- )
-- fi
--
-- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
-- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
-- AC_TRY_RUN(
-- [
-- #include <pthread.h>
-- #include <string.h>
--
-- int main(int argc, char** argv) {
-- pthread_t x1;
-- pthread_t x2;
-- pthread_t x3;
--
-- memset(&x1, 0x0, sizeof(x1));
-- memset(&x2, 0x0, sizeof(x2));
-- memset(&x3, 0x0, sizeof(x3));
--
-- if (sizeof(pthread_t) == 4) {
--
-- atomic_cas_32(&x1, x2, x3);
--
-- } else if (sizeof(pthread_t) == 8) {
--
-- atomic_cas_64(&x1, x2, x3);
--
-- } else {
--
-- return(1);
-- }
--
-- return(0);
-- }
-- ],
-- [
-- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
-- [pthread_t can be used by solaris atomics])
-- AC_MSG_RESULT(yes)
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
-
- # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
- # to use in the source
diff --git a/tools/depends/target/mysql/02-mysqlclient-ios.patch b/tools/depends/target/mysql/02-mysqlclient-ios.patch
deleted file mode 100644
index 3945b48f55..0000000000
--- a/tools/depends/target/mysql/02-mysqlclient-ios.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ruN mysql-5.1.55.org/include/my_global.h mysql-5.1.55/include/my_global.h
---- mysql-5.1.55.org/include/my_global.h 2011-01-25 16:04:37.000000000 +0100
-+++ mysql-5.1.55/include/my_global.h 2011-05-19 22:12:13.000000000 +0200
-@@ -132,7 +132,7 @@
- # define SIZEOF_INT 4
- # define SIZEOF_LONG_LONG 8
- # define SIZEOF_OFF_T 8
--# if defined(__i386__) || defined(__ppc__)
-+# if defined(__i386__) || defined(__ppc__) || defined(__arm__)
- # define SIZEOF_CHARP 4
- # define SIZEOF_LONG 4
- # elif defined(__x86_64__) || defined(__ppc64__)
-diff -ruN mysql-5.1.55.org/include/my_net.h mysql-5.1.55/include/my_net.h
---- mysql-5.1.55.org/include/my_net.h 2011-01-25 16:04:48.000000000 +0100
-+++ mysql-5.1.55/include/my_net.h 2011-05-19 22:13:39.000000000 +0200
-@@ -44,9 +44,9 @@
- #endif
-
- #if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__)
--#include <netinet/in_systm.h>
-+/* #include <netinet/in_systm.h> */
- #include <netinet/in.h>
--#include <netinet/ip.h>
-+/* #include <netinet/ip.h> */
- #if !defined(alpha_linux_port)
- #include <netinet/tcp.h>
- #endif
diff --git a/tools/depends/target/mysql/03-mysqlclient-android.patch b/tools/depends/target/mysql/03-mysqlclient-android.patch
deleted file mode 100644
index 66e45cffe3..0000000000
--- a/tools/depends/target/mysql/03-mysqlclient-android.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru mysql-5.1.55.org/include/my_dir.h mysql-5.1.55/include/my_dir.h
---- mysql-5.1.55.org/include/my_dir.h 2011-01-25 16:04:48.000000000 +0100
-+++ mysql-5.1.55/include/my_dir.h 2011-11-15 20:15:46.000000000 +0100
-@@ -35,9 +35,15 @@
- #define MY_S_ISUID S_ISUID /* set user id on execution */
- #define MY_S_ISGID S_ISGID /* set group id on execution */
- #define MY_S_ISVTX S_ISVTX /* save swapped text even after use */
-+#if defined(__ANDROID__)
-+#define MY_S_IREAD S_IRUSR /* read permission, owner */
-+#define MY_S_IWRITE S_IWUSR /* write permission, owner */
-+#define MY_S_IEXEC S_IEXEC /* execute/search permission, owner */
-+#else
- #define MY_S_IREAD S_IREAD /* read permission, owner */
- #define MY_S_IWRITE S_IWRITE /* write permission, owner */
- #define MY_S_IEXEC S_IEXEC /* execute/search permission, owner */
-+#endif
-
- #define MY_S_ISDIR(m) (((m) & MY_S_IFMT) == MY_S_IFDIR)
- #define MY_S_ISCHR(m) (((m) & MY_S_IFMT) == MY_S_IFCHR)
-diff -ru mysql-5.1.55.org/include/my_global.h mysql-5.1.55/include/my_global.h
---- mysql-5.1.55.org/include/my_global.h 2011-11-15 20:14:37.000000000 +0100
-+++ mysql-5.1.55/include/my_global.h 2011-11-15 20:15:13.000000000 +0100
-@@ -979,6 +979,10 @@
- typedef unsigned char uchar; /* Short for unsigned char */
- #endif
-
-+#ifndef HAVE_USHORT
-+typedef unsigned short ushort;
-+#endif
-+
- #ifndef HAVE_INT8
- typedef signed char int8; /* Signed integer >= 8 bits */
- #endif
-diff -ru mysql-5.1.55.org/mysys/my_gethwaddr.c mysql-5.1.55/mysys/my_gethwaddr.c
---- mysql-5.1.55.org/mysys/my_gethwaddr.c 2011-01-25 16:04:35.000000000 +0100
-+++ mysql-5.1.55/mysys/my_gethwaddr.c 2011-11-15 20:19:11.000000000 +0100
-@@ -66,7 +66,11 @@
-
- #include <net/if.h>
- #include <sys/ioctl.h>
-+#ifdef __ANDROID__
-+#include <net/if_ether.h>
-+#else
- #include <net/ethernet.h>
-+#endif
-
- my_bool my_gethwaddr(uchar *to)
- {
diff --git a/tools/depends/target/mysql/04-strnlen.patch b/tools/depends/target/mysql/04-strnlen.patch
deleted file mode 100644
index 522526ea71..0000000000
--- a/tools/depends/target/mysql/04-strnlen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- strings/strnlen.c 2011-01-25 10:04:52.000000000 -0500
-+++ strings/strnlen.c 2013-01-20 22:37:24.000000000 -0500
-@@ -23,12 +23,15 @@
- #include <my_global.h>
- #include "m_string.h"
-
--#ifndef HAVE_STRNLEN
-
--size_t strnlen(register const char *s, register size_t maxlen)
-+size_t strnlen_int(register const char *s, register size_t maxlen)
- {
-+#ifndef HAVE_STRNLEN
- const char *end= (const char *)memchr(s, '\0', maxlen);
- return end ? (size_t) (end - s) : maxlen;
-+#else
-+ return strnlen(s,maxlen);
-+#endif
-+
- }
-
--#endif
---- include/m_string.h 2011-01-25 10:04:38.000000000 -0500
-+++ include/m_string.h 2013-01-20 22:35:23.000000000 -0500
-@@ -160,7 +160,7 @@
- #endif
- #endif
- #ifndef HAVE_STRNLEN
--extern size_t strnlen(const char *s, size_t n);
-+extern size_t strnlen_int(const char *s, size_t n);
- #endif
-
- #if !defined(__cplusplus)
---- strings/my_vsnprintf.c 2011-01-25 10:04:48.000000000 -0500
-+++ strings/my_vsnprintf.c 2013-01-20 22:34:21.000000000 -0500
-@@ -97,7 +97,7 @@
- reg2 char *par = va_arg(ap, char *);
- size_t plen,left_len = (size_t) (end - to) + 1;
- if (!par) par = (char*)"(null)";
-- plen= (uint) strnlen(par, width);
-+ plen= (uint) strnlen_int(par, width);
- if (left_len <= plen)
- plen = left_len - 1;
- to=strnmov(to,par,plen);
diff --git a/tools/depends/target/mysql/05-mysqlclient-ios64.patch b/tools/depends/target/mysql/05-mysqlclient-ios64.patch
deleted file mode 100644
index f63162a424..0000000000
--- a/tools/depends/target/mysql/05-mysqlclient-ios64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/my_global.h 2015-09-19 16:09:00.000000000 -0400
-+++ b/include/my_global.h-org 2015-09-19 16:05:28.000000000 -0400
-@@ -135,7 +135,7 @@
- # if defined(__i386__) || defined(__ppc__) || defined(__arm__)
- # define SIZEOF_CHARP 4
- # define SIZEOF_LONG 4
--# elif defined(__x86_64__) || defined(__ppc64__)
-+# elif defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__)
- # define SIZEOF_CHARP 8
- # define SIZEOF_LONG 8
- # else
diff --git a/tools/depends/target/mysql/06-fixsslcheck.patch b/tools/depends/target/mysql/06-fixsslcheck.patch
deleted file mode 100644
index 42ef48abbc..0000000000
--- a/tools/depends/target/mysql/06-fixsslcheck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/ac-macros/ssl.m4.orig 2016-02-14 13:47:23.792296242 +0000
-+++ config/ac-macros/ssl.m4 2016-02-14 13:47:05.464296846 +0000
-@@ -111,7 +111,7 @@
- #
- # Try to link with openSSL libs in <location>
- #
-- openssl_libs="-L$location/lib/ -lssl -lcrypto"
-+ openssl_libs="-L$location/lib/ -lssl -lcrypto -lz -ldl"
- MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
-
- if test "$mysql_ssl_found" == "no"
diff --git a/tools/depends/target/mysql/07-no-endpwent.patch b/tools/depends/target/mysql/07-no-endpwent.patch
deleted file mode 100644
index c7d00fb53a..0000000000
--- a/tools/depends/target/mysql/07-no-endpwent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mysys/mf_pack.c-org 2016-03-27 10:59:19.176558034 -0400
-+++ mysys/mf_pack.c 2016-03-27 11:00:00.364557719 -0400
-@@ -381,7 +381,7 @@ static char * NEAR_F expand_tilde(char *
- {
- if (path[0][0] == FN_LIBCHAR)
- return home_dir; /* ~/ expanded to home */
--#ifdef HAVE_GETPWNAM
-+#if defined(HAVE_GETPWNAM) && defined(HAVE_GETPWENT)
- {
- char *str,save;
- struct passwd *user_entry;
-
diff --git a/tools/depends/target/mysql/Makefile b/tools/depends/target/mysql/Makefile
deleted file mode 100644
index 89a7a0452c..0000000000
--- a/tools/depends/target/mysql/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile 01-mysqlclient-cross-compile.patch 02-mysqlclient-ios.patch 03-mysqlclient-android.patch 04-strnlen.patch 05-mysqlclient-ios64.patch 06-fixsslcheck.patch 07-no-endpwent.patch
-
-# lib name, version
-LIBNAME=mysql
-VERSION=5.1.55
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- ./configure --prefix=$(PREFIX) --build=$(BUILD) \
- --enable-thread-safe-client --with-extra-charsets=complex \
- --with-named-thread-libs=-lc --with-named-curses-libs=-lncurses \
- --with-libedit \
- --without-server --without-bench --without-docs --without-man --disable-shared \
- --with-ssl=$(PREFIX) LIBS="-ldl -lz"
-
-LIBDYLIB=$(PLATFORM)/lib$(LIBNAME)/.libs/lib$(LIBNAME)client.a
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); patch -Np1 -i ../01-mysqlclient-cross-compile.patch
- cd $(PLATFORM); patch -Np1 -i ../02-mysqlclient-ios.patch
- cd $(PLATFORM); patch -Np1 -i ../03-mysqlclient-android.patch
- cd $(PLATFORM); patch -p0 < ../04-strnlen.patch
- cd $(PLATFORM); patch -p1 < ../05-mysqlclient-ios64.patch
- cd $(PLATFORM); patch -p0 < ../06-fixsslcheck.patch
- cd $(PLATFORM); patch -p0 < ../07-no-endpwent.patch
- cd $(PLATFORM); $(AUTORECONF) -vif
- cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)/include
- $(MAKE) -C $(PLATFORM)/libmysql
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM)/libmysql install
- $(MAKE) -C $(PLATFORM)/scripts/ install-binSCRIPTS
- $(MAKE) -C $(PLATFORM)/include/ install
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
-