sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Fix building against libiconv

Browse Source
This commit is contained in:
Fredrik Fornwall 2019-05-23 02:11:04 +02:00
parent f528fc3605
commit adb6a80512
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mariadb/build.sh
View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org
TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=10.3.14
TERMUX_PKG_REVISION=4
TERMUX_PKG_REVISION=5
TERMUX_PKG_SHA256=ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054
TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

11
packages/mariadb/libmariadb-libmariadb-CMakeLists.txt.patch Normal file
View File

@ -0,0 +1,11 @@
diff -u -r ../mariadb-10.3.14/libmariadb/libmariadb/CMakeLists.txt ./libmariadb/libmariadb/CMakeLists.txt
--- ../mariadb-10.3.14/libmariadb/libmariadb/CMakeLists.txt 2019-04-01 14:03:57.000000000 +0000
+++ ./libmariadb/libmariadb/CMakeLists.txt 2019-05-22 23:50:06.105346983 +0000
@@ -302,7 +302,6 @@
IF(ICONV_INCLUDE_DIR)
INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
ENDIF()
- ADD_DEFINITIONS(-DLIBICONV_PLUG)
ENDIF()
IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)