cdrom: Run isohybrid only when we have syslinux

[people/pmueller/ipfire-2.x.git] / lfs / squid

diff --git a/lfs/squid b/lfs/squid
index ae4d7ea4493fcc78fa72ede11be9559181a44699..f93097019ea3cbc8bcc120d1d3c221d83483b8c6 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -32,6 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CXXFLAGS+= -Wno-error=format-truncation
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -71,12 +73,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_2.patch
        cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch
 
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
 
-       cd $(DIR_APP) && ./configure \
+       cd $(DIR_APP) && CXXFLAGS="$(CXXFLAGS)" ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/squid \
                --datadir=/usr/lib/squid \