diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2021-03-07 18:30:13 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2021-03-07 18:30:13 +0000 |
| commit | 0741b9e6e56d2a24512204cd5541adbea5be38d3 (patch) | |
| tree | 6cc363b966f51272d5f9fb7a7491090a6659cd39 | |
| parent | c9cf1ffb150634eb3a941c8b6c5df9fee911743f (diff) | |
| download | pkgsrc-0741b9e6e56d2a24512204cd5541adbea5be38d3.tar.gz | |
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.
| -rw-r--r-- | www/squid4/Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/www/squid4/Makefile b/www/squid4/Makefile index 500a556ad75..3903ba1ebf2 100644 --- a/www/squid4/Makefile +++ b/www/squid4/Makefile @@ -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=${VARBASE}/run/squid.pid # 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" |