CVS commit: [pkgsrc-2020Q4] pkgsrc/www/squid4

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Mar  7 18:30:13 UTC 2021

Modified Files:
        pkgsrc/www/squid4 [pkgsrc-2020Q4]: Makefile

Log Message:
Pullup ticket #6432 - requested by mlelstv
www/squid4: build fix

(via patch)

building squid4 requires 64bit atomics. In pkgsrc-HEAD there is
mk/atomics64.mk with the necessary dependencies and www/squid4 includes
it.

In release 2020Q4 this is missing, so a simple pullup of the package
isn't sufficient unless mk/atomics64.mk is also pulled up.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 pkgsrc/www/squid4/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/squid4/Makefile
diff -u pkgsrc/www/squid4/Makefile:1.13 pkgsrc/www/squid4/Makefile:1.13.4.1
--- pkgsrc/www/squid4/Makefile:1.13     Mon Aug 31 18:13:16 2020
+++ pkgsrc/www/squid4/Makefile  Sun Mar  7 18:30:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/08/31 18:13:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13.4.1 2021/03/07 18:30:13 bsiegert Exp $
 
 DISTNAME=      squid-4.13
 PKGREVISION=   1
@@ -35,6 +35,13 @@ CONFIGURE_ARGS+=     --with-pidfile=${VARBAS
 # Let 'purge' find correct config file by default.
 CPPFLAGS+=             -DDEFAULT_SQUID_CONF=\"${PKG_SYSCONFDIR}/squid.conf\"
 
+.if ${MACHINE_ARCH} == "i386"
+.  if empty(CFLAGS:M*march=*)
+CFLAGS+=       -march=i586
+CXXFLAGS+=     -march=i586
+.  endif
+.endif
+
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
 MAKE_ENV+=             INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
@@ -88,5 +95,8 @@ post-install:
                ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
 .endfor
 
+.if ${MACHINE_ARCH} == "powerpc"
+.  include "../../devel/libatomic/buildlink3.mk"
+.endif
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"