[pkgsrc/pkgsrc-2020Q4]: pkgsrc/www/squid4 Pullup ticket #6432 - requested by ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/abb920a51448
branches:  pkgsrc-2020Q4
changeset: 448420:abb920a51448
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Mar 07 18:30:13 2021 +0000

description:
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.

diffstat:

 www/squid4/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 188b53eb2ae0 -r abb920a51448 www/squid4/Makefile
--- a/www/squid4/Makefile       Sat Mar 06 17:03:06 2021 +0000
+++ b/www/squid4/Makefile       Sun Mar 07 18:30:13 2021 +0000
@@ -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 @@
 # 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 @@
                ${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"