diff options
| author | Memphiz <memphis@machzwo.de> | 2016-02-19 07:12:46 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-02-19 07:12:46 +0100 |
| commit | d2273d6f295cb29031359bdeaf2a0189cd4a308e (patch) | |
| tree | 6ab58b6fdf152abbadbe3d7c3769d8ef83688252 /tools | |
| parent | 4596e83f7ce447ea7199521d82a8e945756e42d4 (diff) | |
| parent | e63d71b6b722ed1b39ba50472f29e9aaac818e5a (diff) | |
Merge pull request #6730 from louis89/add_ssl_to_mysql_for_mac_os_x_builds
Enables SSL for MySQL in Mac OS X builds
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/mysql/06-fixsslcheck.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/mysql/Makefile | 4 |
3 files changed, 15 insertions, 2 deletions
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) 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 <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/Makefile b/tools/depends/target/mysql/Makefile index 31fc44335b..94a81a85e9 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 @@ -32,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) |