Normalize handling packages that require 64-bit atomic ops.

5 files changed, 8 insertions, 43 deletions

diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index a26a0189297..4ad33a24453 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2020/11/05 09:08:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.133 2020/12/31 20:04:13 nia Exp $
 
 VERSION=	3.50.0
 DISTNAME=	FileZilla_${VERSION}_src
@@ -28,12 +28,6 @@ GNU_CONFIGURE_WX_VERSION=	no
 GCC_REQD+=		7
 
 .include "options.mk"
-
-# As of 3.41, 64-bit atomic ops are required
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS+=	-march=i586
-.endif
-
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -46,4 +40,5 @@ BUILDLINK_API_DEPENDS.tinyxml+=	tinyxml>=2.6.2nb1
 .include "../../textproc/pugixml/buildlink3.mk"
 BUILDLINK_API_DEPENDS.wxGTK30+=	wxGTK30>=3.0.4
 .include "../../x11/wxGTK30/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index d6a5e784ff9..f171bb3f3cd 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2020/08/31 18:10:33 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2020/12/31 20:04:13 nia Exp $
 
 .include "Makefile.common"
 
@@ -221,4 +221,5 @@ post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/*.a ${DESTDIR}${PREFIX}/lib/*.la
 
 .include "../../mk/pam.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius/hacks.mk b/net/freeradius/hacks.mk
deleted file mode 100644
index bc55f6d0e54..00000000000
--- a/net/freeradius/hacks.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2020/11/16 11:57:19 nia Exp $
-
-.if !defined(FREERADIUS_HACKS_MK)
-FREERADIUS_HACKS_MK=	defined
-
-# [Mon Sep  7 20:40:36 CEST 2020 : he]
-# On NetBSD/powerpc, we don't have native 8-byte atomics,
-# but this package insists on using them, so here we need libatomic.
-.if ${MACHINE_ARCH} == "powerpc"
-PKG_HACKS+=     powerpc-libatomic
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-PKG_HACKS+=	i386-atomics
-CFLAGS+=	-march=i586
-.endif
-
-.endif	# FREERADIUS_HACKS_MK
diff --git a/net/frr/Makefile b/net/frr/Makefile
index 48865735559..2cde931a2ab 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/10 16:43:24 kardel Exp $
+# $NetBSD: Makefile,v 1.2 2020/12/31 20:04:13 nia Exp $
 
 GITHUB_PROJECT=	frr
 VERSION=	7.5
@@ -24,11 +24,6 @@ BUILD_DEFS=		VARBASE
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-# to pick up the atomic implementation on i386
-.if ${MACHINE_ARCH} == "i386"
-CPPFLAGS+=		-march=i586
-.endif
-
 FRR_GROUP?=	_frr
 FRR_VTY_GROUP?=	frrvty
 
@@ -98,7 +93,7 @@ pre-configure:
 .include "../../textproc/json-c/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/readline/buildlink3.mk"
-
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # needs to be here to have ${EGREP} defined
diff --git a/net/grpc/Makefile b/net/grpc/Makefile
index 91b7d5dc528..695d77ec783 100644
--- a/net/grpc/Makefile
+++ b/net/grpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2020/12/06 10:50:11 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2020/12/31 20:04:13 nia Exp $
 
 DISTNAME=	grpc-1.34.0
 CATEGORIES=	net
@@ -25,14 +25,7 @@ CMAKE_ARGS+=	-DgRPC_RE2_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_SSL_PROVIDER=package
 CMAKE_ARGS+=	-DgRPC_ZLIB_PROVIDER=package
 
-.include "../../mk/bsd.prefs.mk"
-
-# 64 bit atomic ops are required
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=		-march=i586
-CXXFLAGS+=		-march=i586
-.endif
-
+.include "../../mk/atomic64.mk"
 .include "../../benchmarks/google-benchmark/buildlink3.mk"
 .include "../../devel/abseil/buildlink3.mk"
 .include "../../devel/gflags/buildlink3.mk"