From eaa3099a63dcb814e80f1ccae6683901f15186d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 25 Apr 2019 17:45:17 +0200 Subject: [PATCH] mysql: fix cross build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to @jnbr. Set TRY_RUN() flag and result code for HAVE_LIBCPP_EXITCODE. Also enable parallel builds again because they seem to work just fine. Closes: #11063 Signed-off-by: Jürgen Buchmüller --- srcpkgs/mysql/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index 9a0d4d7652f..78fcbfa7681 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.6.43 -revision=1 +revision=2 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -31,9 +31,11 @@ system_accounts="mysql" mysql_homedir="/var/lib/mysql" lib32disabled=yes -disable_parallel_build=yes - CFLAGS="-D__STDC_ISO_10646__" +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE=1" + configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE__TRYRUN_OUTPUT=0" +fi pre_configure() { # libressl major detection. @@ -44,7 +46,7 @@ pre_configure() { if [ "$CROSS_BUILD" ]; then CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake . make comp_err comp_sql gen_lex_hash gen_lex_token - mkdir bin.host + mkdir -p bin.host cp extra/comp_err bin.host cp scripts/comp_sql bin.host cp sql/gen_lex_hash bin.host