wok-next diff mysql/receipt @ rev 21469

updated tinc (1.0.25 -> 1.0.36)
author Hans-G?nter Theisgen
date Wed May 13 07:41:00 2020 +0100 (2020-05-13)
parents c9a7a7b42a86
children
line diff
     1.1 --- a/mysql/receipt	Sat Sep 22 16:05:26 2018 +0300
     1.2 +++ b/mysql/receipt	Wed May 13 07:41:00 2020 +0100
     1.3 @@ -7,21 +7,21 @@
     1.4  MAINTAINER="pascal.bellard@slitaz.org"
     1.5  LICENSE="GPL2"
     1.6  WEB_SITE="https://www.mysql.com/"
     1.7 -#CROSS="bug: can not run test programm"
     1.8  
     1.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.10  WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${VERSION%.*}/$TARBALL"
    1.11  
    1.12  BUILD_DEPENDS="cmake zlib-dev ncurses-dev readline-dev libunistring-dev \
    1.13  libaio-dev"
    1.14 -SPLIT="libmysqlclient mysql-client mysql-test mysql-dev mysql"
    1.15 +SPLIT="libmysqlclient $PACKAGE-client $PACKAGE-test $PACKAGE-dev $PACKAGE"
    1.16  
    1.17  compile_rules() {
    1.18 -	mkdir build; cd build
    1.19 +	mkdir build
    1.20 +	cd    build
    1.21  
    1.22  	# CFLAGS/CXXFLAGS as suggested upstream
    1.23 -	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
    1.24 -	CXXFLAGS="-fPIC ${CXXFLAGS} -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
    1.25 +	CFLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
    1.26 +	CXXFLAGS="-fPIC $CXXFLAGS -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
    1.27  	cmake .. \
    1.28  		-DCMAKE_BUILD_TYPE=Release \
    1.29  		-DCMAKE_INSTALL_PREFIX=/usr \
    1.30 @@ -45,7 +45,7 @@
    1.31  		-DWITH_ZLIB=system \
    1.32  		-DWITH_SSL=bundled \
    1.33  		-DWITH_LIBWRAP=OFF \
    1.34 -		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
    1.35 +		-DWITH_MYSQLD_LDFLAGS="$LDFLAGS" \
    1.36  		-DWITH_EXTRA_CHARSETS=complex \
    1.37  		-DWITH_EMBEDDED_SERVER=ON \
    1.38  		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
    1.39 @@ -54,7 +54,8 @@
    1.40  		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
    1.41  		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
    1.42  		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 &&
    1.43 -	make && make DESTDIR=$DESTDIR install || return 1
    1.44 +	make &&
    1.45 +	make DESTDIR=$install install || return 1
    1.46  
    1.47  	# fix paths
    1.48  	mv $install/usr/mysql-test $install/usr/share/mysql-test
    1.49 @@ -74,7 +75,7 @@
    1.50  			CAT="database|client libraries"
    1.51  			DEPENDS="zlib"
    1.52  			;;
    1.53 -		mysql-client)
    1.54 +		*-client)
    1.55  			# client binaries (plus /usr/bin/mysql), see $src/build/client
    1.56  			copy /bin/mysql mysql_plugin mysql_upgrade mysqladmin mysqlbinlog \
    1.57  			mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqltest
    1.58 @@ -82,7 +83,7 @@
    1.59  			PROVIDE="mysql_or_postgresql"
    1.60  			DEPENDS="libmysqlclient ncurses zlib"
    1.61  			;;
    1.62 -		mysql-test)
    1.63 +		*-test)
    1.64  			copy mysql-test/ sql-bench/ db.opt
    1.65  			CAT="development|tests and benchmarks"
    1.66  			DEPENDS="mysql perl"