Merge remote-tracking branch 'ms/ipsec-dpd' into fifteen

diff --git a/lfs/mysql b/lfs/mysql
index 5fcd7b3acfafee2bfd1e676d03d15f9ead01f4a5..aa5c3579f05e6258d92f56d00e4c453e154068a8 100644 (file)
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -32,7 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mysql
-PAK_VER    = 2
+PAK_VER    = 3
+
+CFLAGS += -fno-strict-aliasing
 
 ###############################################################################
 # Top-level Rules
@@ -75,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && C_EXTRA_FLAGS=-fno-strict-aliasing
        cd $(DIR_APP) && ./configure --prefix=/usr \
                            --sysconfdir=/etc \
                            --libexecdir=/usr/sbin \