mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-10 02:55:55 +02:00
mysql: Fix build with newer GCC
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -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}"
|
||||
|
||||
Reference in New Issue
Block a user