From f778ae3123289f877090007370bb003c0e3932c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 2 Dec 2013 10:00:51 +0100 Subject: [PATCH] mariadb: update to 5.5.34; cross build still broken. --- srcpkgs/mariadb/template | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index b0ba600b376..4574cfac034 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb -version=5.5.33 -revision=3 +version=5.5.34 +revision=1 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -18,27 +18,18 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_EXTRA_CHARSETS=complex -DSTACK_DIRECTION=1" -hostmakedepends="perl cmake bison" +hostmakedepends="perl cmake bison ncurses-devel" makedepends="zlib-devel ncurses-devel openssl-devel readline-devel" short_desc="Fast SQL database server, drop-in replacement for MySQL" maintainer="Juan RP " homepage="http://mariadb.org/" license="GPL-2" distfiles="http://mirrors.supportex.net/$pkgname/$pkgname-$version/kvm-tarbake-jaunty-x86/$pkgname-$version.tar.gz" -checksum=233251494242e7c964523f834e513e624728f2c2602ada0eb717aaff777ac546 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" ncurses-devel" -fi +checksum=a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 pre_configure() { # We need some host binaries before starting cross compilation. if [ "$CROSS_BUILD" ]; then - # Set sysroot and host. - sed -e "s,enable-static,& --sysroot=$XBPS_CROSS_BASE --host=$XBPS_CROSS_TRIPLET," \ - -i storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake - sed -e "s,enable-cc-silence\",& \"--host=$XBPS_CROSS_TRIPLET\"," \ - -i cmake/jemalloc.cmake # XXX still broken: jemalloc configure execs host bins. CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake . make comp_err comp_sql gen_lex_hash