X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/2b468f0d74adcd887b3c96d79035b6fea9b1a1a1..8fcd0f1a727ffcc2788c19a77461fb260408ed47:/packages/mariadb/build.sh

diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index 37fd58dc..53abd302 100644
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
-TERMUX_PKG_VERSION=10.2.6
+TERMUX_PKG_VERSION=10.2.9
+TERMUX_PKG_SHA256=12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124
 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=`which bison`
 -DBUILD_CONFIG=mysql_release
@@ -13,6 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/import_executables.cmake
 -DINSTALL_LAYOUT=DEB
 -DINSTALL_UNIX_ADDRDIR=$TERMUX_PREFIX/tmp/mysqld.sock
+-DINSTALL_SBINDIR=$TERMUX_PREFIX/bin
 -DMYSQL_DATADIR=$TERMUX_PREFIX/var/lib/mysql
 -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
 -DPLUGIN_AUTH_GSSAPI=NO
@@ -55,22 +56,30 @@ termux_step_host_build () {
 }
 
 termux_step_pre_configure () {
-	# it will try to define off64_t with off_t if unset
-	# and 32 bit Android has wrong off_t defined
-	CPPFLAGS="$CPPFLAGS -Dushort=u_short -D__off64_t_defined"
+	CPPFLAGS+=" -Dushort=u_short"
+
+	if [ $TERMUX_ARCH_BITS = 32 ]; then
+		CPPFLAGS+=" -D__off64_t_defined -DTERMUX_EXPOSE_FILE_OFFSET64=1"
+	fi
+
+	if [ $TERMUX_ARCH = "i686" ]; then
+		# Avoid undefined reference to __atomic_load_8:
+		CFLAGS+=" -latomic"
+	fi
 }
 
 termux_step_post_make_install () {
-	mkdir -p $TERMUX_PREFIX/var/lib/mysql
 	# files not needed
 	rm -r $TERMUX_PREFIX/{mysql-test,sql-bench}
 	rm $TERMUX_PREFIX/share/man/man1/mysql-test-run.pl.1
 }
 
 termux_step_create_debscripts () {
-	return
-	echo "echo 'Initializing mysql data directory...'" > postinst
-	echo "$TERMUX_PREFIX/bin/mysql_install_db --user=\`whoami\` --datadir=$TERMUX_PREFIX/var/lib/mysql --basedir=$TERMUX_PREFIX" >> postinst
+	echo "if [ ! -e "$TERMUX_PREFIX/var/lib/mysql" ]; then" > postinst
+	echo "  echo 'Initializing mysql data directory...'" >> postinst
+	echo "  mkdir -p $TERMUX_PREFIX/var/lib/mysql" >> postinst
+	echo "  $TERMUX_PREFIX/bin/mysql_install_db --user=\`whoami\` --datadir=$TERMUX_PREFIX/var/lib/mysql --basedir=$TERMUX_PREFIX" >> postinst
+	echo "fi" >> postinst
 	echo "exit 0" >> postinst
 	chmod 0755 postinst
 }