diff options
| author | Memphiz <memphis@machzwo.de> | 2015-12-21 10:19:07 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-01-06 15:52:18 +0100 |
| commit | e3c7e7929006bb06087c7e185551447a20e5e923 (patch) | |
| tree | 3540d18fac31cc8a76a1eadd6f2ee14a7a904b88 | |
| parent | f749a79f503dc4789bedde0545cdf6d163301070 (diff) | |
[depends/mysql] - fixed arm64 compilation
| -rw-r--r-- | tools/depends/target/mysql/05-mysqlclient-ios64.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/mysql/Makefile | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/tools/depends/target/mysql/05-mysqlclient-ios64.patch b/tools/depends/target/mysql/05-mysqlclient-ios64.patch new file mode 100644 index 0000000000..ae037d8e54 --- /dev/null +++ b/tools/depends/target/mysql/05-mysqlclient-ios64.patch @@ -0,0 +1,11 @@ +--- 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(__arm64__) + # define SIZEOF_CHARP 8 + # define SIZEOF_LONG 8 + # else diff --git a/tools/depends/target/mysql/Makefile b/tools/depends/target/mysql/Makefile index 84ea391c5d..31fc44335b 100644 --- a/tools/depends/target/mysql/Makefile +++ b/tools/depends/target/mysql/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include 01-mysqlclient-cross-compile.patch 02-mysqlclient-ios.patch 03-mysqlclient-android.patch Makefile +DEPS= ../../Makefile.include 01-mysqlclient-cross-compile.patch 02-mysqlclient-ios.patch 03-mysqlclient-android.patch 04-strnlen.patch 05-mysqlclient-ios64.patch Makefile # lib name, version LIBNAME=mysql @@ -31,6 +31,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) 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); autoconf cd $(PLATFORM); $(CONFIGURE) |