webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

mysql: Fix build with newer GCC

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-27 12:04:05 +02:00
parent dfa795eb1a
commit a3366d419f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lfs/mysql
View File

@@ -34,7 +34,8 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mysql PROG = mysql
PAK_VER = 3 PAK_VER = 3
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
CXXFLAGS += -std=gnu++98
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
@@ -77,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure --prefix=/usr \ cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--libexecdir=/usr/sbin \ --libexecdir=/usr/sbin \
@@ -96,8 +98,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* . cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf
mkdir -p /srv/mysql mkdir -p /srv/mysql
mysql_install_db --user=mysql --force
chgrp -v mysql /srv/mysql{,/test,/mysql}
chown mysql.mysql /srv/mysql/ chown mysql.mysql /srv/mysql/
install -v -m755 -o mysql -g mysql -d /var/run/mysql install -v -m755 -o mysql -g mysql -d /var/run/mysql
install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \ install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \

3
src/paks/mysql/install.sh
View File

@@ -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/rc3.d/S34mysql
ln -svf ../init.d/mysql /etc/rc.d/rc6.d/K26mysql ln -svf ../init.d/mysql /etc/rc.d/rc6.d/K26mysql
# Initialise database
mysql_install_db --user=mysql
restore_backup "${NAME}" restore_backup "${NAME}"
start_service "${NAME}" start_service "${NAME}"