From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Apr 2017 10:04:05 +0000 (+0200)
Subject: mysql: Fix build with newer GCC
X-Git-Tag: v2.19-core112~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3366d419fee79d2c195fc72423c32bf221bfcdb;p=ipfire-2.x.git

mysql: Fix build with newer GCC

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/mysql b/lfs/mysql
index 089516efa3..8c739c26ac 100644
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -34,7 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mysql
 PAK_VER    = 3
 
-CFLAGS += -fno-strict-aliasing
+CFLAGS    += -fno-strict-aliasing
+CXXFLAGS  += -std=gnu++98
 
 ###############################################################################
 # Top-level Rules
@@ -77,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=/usr \
 		            --sysconfdir=/etc \
 		            --libexecdir=/usr/sbin \
@@ -96,8 +98,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
 	install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf
 	mkdir -p /srv/mysql
-	mysql_install_db --user=mysql --force
-	chgrp -v mysql /srv/mysql{,/test,/mysql}
 	chown mysql.mysql /srv/mysql/
 	install -v -m755 -o mysql -g mysql -d /var/run/mysql
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \
diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh
index a27d09ed61..1653c9abf3 100644
--- a/src/paks/mysql/install.sh
+++ b/src/paks/mysql/install.sh
@@ -29,6 +29,9 @@ ln -svf  ../init.d/mysql /etc/rc.d/rc0.d/K26mysql
 ln -svf  ../init.d/mysql /etc/rc.d/rc3.d/S34mysql
 ln -svf  ../init.d/mysql /etc/rc.d/rc6.d/K26mysql
 
+# Initialise database
+mysql_install_db --user=mysql
+
 restore_backup "${NAME}"
 
 start_service "${NAME}"