wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-27 07:52:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mysql: fix cross build

Browse source 
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 <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2019-04-25 17:45:17 +02:00
parent 3f4da6f802
commit eaa3099a63
No known key found for this signature in database
GPG key ID: DE55AD8DBEBB4EE8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/mysql/template
View file

@ -1,7 +1,7 @@
# Template file for 'mysql' # Template file for 'mysql'
pkgname=mysql pkgname=mysql
version=5.6.43 version=5.6.43
revision=1 revision=2
build_style=cmake build_style=cmake
configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@ -31,9 +31,11 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql" mysql_homedir="/var/lib/mysql"
lib32disabled=yes lib32disabled=yes
disable_parallel_build=yes
CFLAGS="-D__STDC_ISO_10646__" 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() { pre_configure() {
# libressl major detection. # libressl major detection.
@ -44,7 +46,7 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake . CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
make comp_err comp_sql gen_lex_hash gen_lex_token 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 extra/comp_err bin.host
cp scripts/comp_sql bin.host cp scripts/comp_sql bin.host
cp sql/gen_lex_hash bin.host cp sql/gen_lex_hash bin.host