From 0693e75a5a555685db7230b50a04ae20771a34d1 Mon Sep 17 00:00:00 2001 From: Louis DaPrato Date: Sun, 15 Mar 2015 14:56:39 -0400 Subject: Added options to mysql Makefile to enable SSL for MySQL in Mac OS X builds --- tools/depends/target/mysql/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/depends/target/mysql/Makefile b/tools/depends/target/mysql/Makefile index 31fc44335b..fe3490d0a6 100644 --- a/tools/depends/target/mysql/Makefile +++ b/tools/depends/target/mysql/Makefile @@ -13,7 +13,8 @@ CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ --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 + --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 -- cgit v1.2.3 From a55315a72de8d11283446c857abab9f02f793c42 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Sun, 14 Feb 2016 14:55:32 +0100 Subject: [depends/mysql] - fixed openssl check --- tools/depends/target/mysql/06-fixsslcheck.patch | 11 +++++++++++ tools/depends/target/mysql/Makefile | 1 + 2 files changed, 12 insertions(+) create mode 100644 tools/depends/target/mysql/06-fixsslcheck.patch (limited to 'tools') diff --git a/tools/depends/target/mysql/06-fixsslcheck.patch b/tools/depends/target/mysql/06-fixsslcheck.patch new file mode 100644 index 0000000000..42ef48abbc --- /dev/null +++ b/tools/depends/target/mysql/06-fixsslcheck.patch @@ -0,0 +1,11 @@ +--- 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 + # +- 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/Makefile b/tools/depends/target/mysql/Makefile index fe3490d0a6..94a81a85e9 100644 --- a/tools/depends/target/mysql/Makefile +++ b/tools/depends/target/mysql/Makefile @@ -33,6 +33,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) 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); autoconf cd $(PLATFORM); $(CONFIGURE) -- cgit v1.2.3 From e63d71b6b722ed1b39ba50472f29e9aaac818e5a Mon Sep 17 00:00:00 2001 From: Memphiz Date: Sun, 14 Feb 2016 14:55:48 +0100 Subject: [depends] - mysql needs zlib now --- tools/depends/target/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index b205fa8f9f..ed625ab642 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -89,7 +89,7 @@ libcdio: $(ICONV) libplist: libxml2 $(ZLIB) libbluray: $(ICONV) libxml2 libssh: libgcrypt openssl $(ZLIB) -mysql: openssl +mysql: openssl $(ZLIB) libzip: $(ZLIB) libpng: $(ZLIB) openssl: $(ZLIB) -- cgit v1.2.3