From 96f75b459d7c5be0d64d0ddf96c0d543c939df59 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 13 May 2020 12:18:38 +0300 Subject: [PATCH] mariadb: fix deletion of unneeded files Do this with TERMUX_PKG_RM_AFTER_INSTALL instead of post-make-install step. --- packages/mariadb/build.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 9d500d84d..e295d589b 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -52,10 +52,15 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DWITH_UNIT_TESTS=OFF -DINSTALL_SYSCONFDIR=$TERMUX_PREFIX/etc " - TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_CONFLICTS="mysql" -TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*" + +TERMUX_PKG_RM_AFTER_INSTALL=" +bin/mysqltest* +share/man/man1/mysql-test-run.pl.1 +mysql-test +sql-bench +" # i686 build fails due to: # /home/builder/.termux-build/mariadb/src/include/my_pthread.h:822:10: error: use of undeclared identifier 'my_atomic_add32' @@ -90,12 +95,6 @@ termux_step_pre_configure() { fi } -termux_step_post_make_install() { - # files not needed - rm -r $TERMUX_PREFIX/{mysql-test,sql-bench} - rm $TERMUX_PREFIX/share/man/man1/mysql-test-run.pl.1 -} - termux_step_post_massage() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/my.cnf.d }