'CVS commit: pkgsrc'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pkgsrc-changes
Subject:    CVS commit: pkgsrc
From:       "Nia Alarie" <nia () netbsd ! org>
Date:       2020-12-31 20:04:15
Message-ID: 20201231200415.3D3D9FA9D () cvs ! NetBSD ! org
[Download RAW message or body]

This is a multi-part message in MIME format.

--_----------=_1609445055287620
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Dec 31 20:04:14 UTC 2020

Modified Files:
	pkgsrc/audio/audacity: Makefile
	pkgsrc/audio/cmus: Makefile
	pkgsrc/databases/kyotocabinet: Makefile
	pkgsrc/databases/mysql57-client: Makefile.common
	pkgsrc/databases/redis: Makefile
	pkgsrc/devel/protobuf: Makefile
	pkgsrc/emulators/libretro-parallel-n64: Makefile
	pkgsrc/games/lgogdownloader: Makefile
	pkgsrc/games/supertuxkart: Makefile
	pkgsrc/graphics/inkscape: Makefile
	pkgsrc/lang/mozjs78: Makefile
	pkgsrc/lang/nodejs: Makefile
	pkgsrc/lang/nodejs12: Makefile
	pkgsrc/misc/libreoffice: Makefile
	pkgsrc/multimedia/lightspark: Makefile
	pkgsrc/multimedia/mpv: Makefile
	pkgsrc/net/filezilla: Makefile
	pkgsrc/net/freeradius: Makefile
	pkgsrc/net/frr: Makefile
	pkgsrc/net/grpc: Makefile
	pkgsrc/print/qpdf: Makefile
	pkgsrc/sysutils/rsyslog: Makefile
	pkgsrc/www/firefox: mozilla-common.mk
	pkgsrc/www/firefox52: mozilla-common.mk
	pkgsrc/www/firefox68: mozilla-common.mk
	pkgsrc/www/firefox78: mozilla-common.mk
	pkgsrc/www/seamonkey: mozilla-common.mk
	pkgsrc/www/webkit-gtk: Makefile
	pkgsrc/www/webkit24-gtk: Makefile.common
	pkgsrc/x11/qt5-qtwebkit: Makefile
Added Files:
	pkgsrc/mk: atomic64.mk
Removed Files:
	pkgsrc/databases/mysql57-client: hacks.mk
	pkgsrc/databases/mysql57-server: hacks.mk
	pkgsrc/devel/protobuf: hacks.mk
	pkgsrc/net/freeradius: hacks.mk
	pkgsrc/print/qpdf: hacks.mk
	pkgsrc/www/webkit-gtk: hacks.mk
	pkgsrc/www/webkit24-gtk: hacks.mk
	pkgsrc/www/webkit24-gtk3: hacks.mk

Log Message:
Normalize handling packages that require 64-bit atomic ops.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/audio/audacity/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/audio/cmus/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/kyotocabinet/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql57-client/hacks.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql57-server/hacks.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/databases/redis/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/protobuf/hacks.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/libretro-parallel-n64/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/games/lgogdownloader/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/games/supertuxkart/Makefile
cvs rdiff -u -r1.222 -r1.223 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/mozjs78/Makefile
cvs rdiff -u -r1.204 -r1.205 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/nodejs12/Makefile
cvs rdiff -u -r1.247 -r1.248 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mk/atomic64.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/lightspark/Makefile
cvs rdiff -u -r1.119 -r1.120 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/net/filezilla/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/net/freeradius/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/net/freeradius/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/frr/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/print/qpdf/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/print/qpdf/hacks.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/rsyslog/Makefile
cvs rdiff -u -r1.191 -r1.192 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/firefox68/mozilla-common.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox78/mozilla-common.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/seamonkey/mozilla-common.mk
cvs rdiff -u -r1.199 -r1.200 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/webkit-gtk/hacks.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/webkit24-gtk/Makefile.common
cvs rdiff -u -r1.2 -r0 pkgsrc/www/webkit24-gtk/hacks.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/www/webkit24-gtk3/hacks.mk
cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/qt5-qtwebkit/Makefile

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


--_----------=_1609445055287620
Content-Disposition: inline
Content-Length: 31292
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/audacity/Makefile
diff -u pkgsrc/audio/audacity/Makefile:1.137 pkgsrc/audio/audacity/Makefile:1.138
--- pkgsrc/audio/audacity/Makefile:1.137	Fri Nov 13 16:09:47 2020
+++ pkgsrc/audio/audacity/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2020/11/13 16:09:47 nia Exp $
+# $NetBSD: Makefile,v 1.138 2020/12/31 20:04:11 nia Exp $
 
 DISTNAME=	audacity-2.4.1
 PKGREVISION=	2
@@ -53,16 +53,6 @@ CONFIGURE_ARGS+=	--with-soundtouch="syst
 
 .include "../../mk/bsd.prefs.mk"
 
-# 64 bit atomic ops are required
-
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS+=		-march=i586
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
 CONFIGURE_ARGS+=	--disable-sse
 .endif
@@ -117,4 +107,5 @@ BUILDLINK_API_DEPENDS.flac+=	flac>=1.3.0
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/cmus/Makefile
diff -u pkgsrc/audio/cmus/Makefile:1.90 pkgsrc/audio/cmus/Makefile:1.91
--- pkgsrc/audio/cmus/Makefile:1.90	Fri Nov 13 16:10:43 2020
+++ pkgsrc/audio/cmus/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2020/11/13 16:10:43 nia Exp $
+# $NetBSD: Makefile,v 1.91 2020/12/31 20:04:11 nia Exp $
 
 DISTNAME=		cmus-2.8.0
 PKGREVISION=		7
@@ -47,17 +47,8 @@ CONFIGURE_ARGS+=	CONFIG_SUN=n
 PLIST.coreaudio=	yes
 .endif
 
-# 64 bit atomic ops are required
-
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=	-march=i586
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 .include "options.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/ncursesw/buildlink3.mk"

Index: pkgsrc/databases/kyotocabinet/Makefile
diff -u pkgsrc/databases/kyotocabinet/Makefile:1.8 \
                pkgsrc/databases/kyotocabinet/Makefile:1.9
--- pkgsrc/databases/kyotocabinet/Makefile:1.8	Mon Nov 23 14:00:39 2020
+++ pkgsrc/databases/kyotocabinet/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/11/23 14:00:39 nia Exp $
+# $NetBSD: Makefile,v 1.9 2020/12/31 20:04:11 nia Exp $
 #
 
 DISTNAME=	kyotocabinet-1.2.78
@@ -23,17 +23,5 @@ TEST_TARGET=	check
 
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-# using GCC atomic functions only available with i586 in kcthread.cc
-.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi[34]86)
-GNU_ARCH.i386=		i586
-CFLAGS+=		-march=i586
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/mysql57-client/Makefile.common
diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.29 \
                pkgsrc/databases/mysql57-client/Makefile.common:1.30
--- pkgsrc/databases/mysql57-client/Makefile.common:1.29	Wed Oct 21 13:34:50 2020
+++ pkgsrc/databases/mysql57-client/Makefile.common	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2020/10/21 13:34:50 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2020/12/31 20:04:11 nia Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
@@ -75,12 +75,6 @@ CMAKE_ARGS+=	-DDEFAULT_CHARSET=${MYSQL_C
 CMAKE_ARGS+=	-DDEFAULT_COLLATION=${MYSQL_COLLATION}
 CMAKE_ARGS+=	-DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
 
-# we need atomic builtins
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-GNU_ARCH.i386=		i586
-CFLAGS+=		-march=i586
-.endif
-
 CPPFLAGS+=		-Dunix
 CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
 #CFLAGS+=		-D__STDC_FORMAT_MACROS=1 # always defined too late
@@ -132,3 +126,4 @@ CHECK_PORTABILITY_SKIP+=	packaging/deb-i
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
+.include "../../mk/atomic64.mk"

Index: pkgsrc/databases/redis/Makefile
diff -u pkgsrc/databases/redis/Makefile:1.62 pkgsrc/databases/redis/Makefile:1.63
--- pkgsrc/databases/redis/Makefile:1.62	Tue Oct 27 10:22:34 2020
+++ pkgsrc/databases/redis/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2020/10/27 10:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.63 2020/12/31 20:04:11 nia Exp $
 
 DISTNAME=	redis-6.0.9
 CATEGORIES=	databases
@@ -60,11 +60,6 @@ CHECK_PORTABILITY_SKIP+=	deps/jemalloc/c
 post-extract:
 	${CHMOD} -R g-w ${WRKSRC}
 
-.if ${MACHINE_ARCH} == "i386"
-# Need 8 byte atomics.
-CFLAGS+=		-march=i586
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/redis.conf ${DESTDIR}${EGDIR}/redis.conf.example
 .for file in ${DOCFILES}
@@ -75,4 +70,5 @@ do-test:
 	cd ${WRKSRC} && ${SH} runtest
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/protobuf/Makefile
diff -u pkgsrc/devel/protobuf/Makefile:1.35 pkgsrc/devel/protobuf/Makefile:1.36
--- pkgsrc/devel/protobuf/Makefile:1.35	Sat Nov 14 14:07:40 2020
+++ pkgsrc/devel/protobuf/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/11/14 14:07:40 adam Exp $
+# $NetBSD: Makefile,v 1.36 2020/12/31 20:04:11 nia Exp $
 
 DISTNAME=	protobuf-cpp-3.14.0
 PKGNAME=	${DISTNAME:S/-cpp//}
@@ -29,11 +29,6 @@ CHECK_PORTABILITY_SKIP+=	src/google/prot
 
 SET_LIBDIR=	yes
 
-.if ${MACHINE_ARCH} == "i386"
-# 64 bit atomic ops are required
-CXXFLAGS+=	-march=i586
-.endif
-
 # configure: error: *** A compiler with support for C++11 language features is \
required.  GCC_REQD+=	4.8
 
@@ -42,4 +37,5 @@ GCC_REQD+=	4.8
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.0.4
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/libretro-parallel-n64/Makefile
diff -u pkgsrc/emulators/libretro-parallel-n64/Makefile:1.2 \
                pkgsrc/emulators/libretro-parallel-n64/Makefile:1.3
--- pkgsrc/emulators/libretro-parallel-n64/Makefile:1.2	Fri Nov 13 16:15:54 2020
+++ pkgsrc/emulators/libretro-parallel-n64/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/11/13 16:15:54 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/12/31 20:04:11 nia Exp $
 
 DISTNAME=	libretro-parallel-n64-20200528
 CATEGORIES=	emulators
@@ -36,12 +36,9 @@ MAKE_FLAGS+=	WITH_DYNAREC=
 CFLAGS+=	-DNO_ASM
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./libretro/link.T
 
 .include "options.mk"
 .include "../../emulators/retroarch/core.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/lgogdownloader/Makefile
diff -u pkgsrc/games/lgogdownloader/Makefile:1.50 \
                pkgsrc/games/lgogdownloader/Makefile:1.51
--- pkgsrc/games/lgogdownloader/Makefile:1.50	Fri May 22 10:56:08 2020
+++ pkgsrc/games/lgogdownloader/Makefile	Thu Dec 31 20:04:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2020/05/22 10:56:08 adam Exp $
+# $NetBSD: Makefile,v 1.51 2020/12/31 20:04:11 nia Exp $
 
 DISTNAME=	lgogdownloader-3.7
 PKGREVISION=	1
@@ -17,13 +17,6 @@ USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-# 64 bit atomic ops are required
-CXXFLAGS+=	-march=i586
-.endif
-
 CMAKE_ARGS+=	-DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json
 
 .include "../../devel/boost-libs/buildlink3.mk"
@@ -32,4 +25,5 @@ CMAKE_ARGS+=	-DJSONCPP_INCLUDE_DIR=${BUI
 .include "../../www/curl/buildlink3.mk"
 .include "../../misc/rhash/buildlink3.mk"
 .include "../../textproc/jsoncpp/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/supertuxkart/Makefile
diff -u pkgsrc/games/supertuxkart/Makefile:1.37 \
                pkgsrc/games/supertuxkart/Makefile:1.38
--- pkgsrc/games/supertuxkart/Makefile:1.37	Fri May 22 10:56:10 2020
+++ pkgsrc/games/supertuxkart/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/05/22 10:56:10 adam Exp $
+# $NetBSD: Makefile,v 1.38 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	supertuxkart-1.1-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -22,20 +22,6 @@ CMAKE_ARGS+=	-DBUILD_RECORDER=OFF
 # Needs linux joystick support.
 CMAKE_ARGS+=	-DENABLE_WAYLAND_DEVICE=OFF
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-# 64 bit atomic ops are required
-CXXFLAGS+=	-march=i586
-.endif
-
-# lib/mcpp/eval.c: In function 'eval_if':
-# lib/mcpp/eval.c:361:44: error: array subscript has type 'char' \
                [-Werror=char-subscripts]
-#                  , opname[ op], prec, opname[ opp->op], opp->prec, opp->skip);
-#                                             ^
-# Maybe fix this later.
-BUILDLINK_TRANSFORM+=	rm:-Werror=char-subscripts
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
@@ -56,4 +42,5 @@ BUILDLINK_TRANSFORM+=	rm:-Werror=char-su
 .endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.222 \
                pkgsrc/graphics/inkscape/Makefile:1.223
--- pkgsrc/graphics/inkscape/Makefile:1.222	Sat Dec 26 17:02:37 2020
+++ pkgsrc/graphics/inkscape/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.222 2020/12/26 17:02:37 nia Exp $
+# $NetBSD: Makefile,v 1.223 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	inkscape-1.0.1
 PKGREVISION=	3
@@ -75,15 +75,6 @@ MANCOMPRESSED=	yes
 CMAKE_ARGS+=	-DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=	-march=i586
-CXXFLAGS+=	-march=i586
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-.  include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 # There exists some race condition in create_default_templates.py that
 # makes default.es_MX.svg sometimes not get installed.
 # (gettext translation file dependency not correctly expressed in cmake?)
@@ -121,4 +112,5 @@ BUILDLINK_API_DEPENDS.boehm-gc+=	boehm-g
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/mozjs78/Makefile
diff -u pkgsrc/lang/mozjs78/Makefile:1.15 pkgsrc/lang/mozjs78/Makefile:1.16
--- pkgsrc/lang/mozjs78/Makefile:1.15	Wed Dec 30 06:10:37 2020
+++ pkgsrc/lang/mozjs78/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/12/30 06:10:37 gutteridge Exp $
+# $NetBSD: Makefile,v 1.16 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	mozjs78_78.4.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -39,20 +39,6 @@ CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PL
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-pie
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-# 64 bit atomics
-CXXFLAGS+=		-march=i586
-.endif
-
-# XXX This does not work entirely correctly at present. There are
-# 26 atomic type test failures on powerpc, where these pass on i386.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
-# 64 bit atomics
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-configure
 SUBST_MESSAGE.conf=	Set variables in configuration file.
@@ -93,4 +79,7 @@ RUST_REQ=	1.41.0
 .include "../../lang/python/tool.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
+# XXX This does not work entirely correctly at present. There are
+# 26 atomic type test failures on powerpc, where these pass on i386.
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.204 pkgsrc/lang/nodejs/Makefile:1.205
--- pkgsrc/lang/nodejs/Makefile:1.204	Mon Dec 21 09:41:32 2020
+++ pkgsrc/lang/nodejs/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2020/12/21 09:41:32 adam Exp $
+# $NetBSD: Makefile,v 1.205 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	node-v14.15.3
 EXTRACT_SUFX=	.tar.xz
@@ -18,8 +18,6 @@ PYTHON_VERSIONS_ACCEPTED=	27
 CHECK_PORTABILITY_SKIP+=	tools/macos-installer/pkgbuild/npm/scripts/preinstall
 
 .if ${MACHINE_ARCH} == "i386"
-# 64 bit atomic ops are required
-CXXFLAGS+=	-march=i586
 # required for SSE2 code under i386.
 CXXFLAGS+=	-mstackrealign
 .endif
@@ -38,4 +36,5 @@ CXXFLAGS+=	-mstackrealign
 # Requires nghttp2_option_set_max_settings
 BUILDLINK_API_DEPENDS.nghttp2+=	nghttp2>=1.41.0
 .include "../../www/nghttp2/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/nodejs12/Makefile
diff -u pkgsrc/lang/nodejs12/Makefile:1.26 pkgsrc/lang/nodejs12/Makefile:1.27
--- pkgsrc/lang/nodejs12/Makefile:1.26	Wed Dec 16 07:42:39 2020
+++ pkgsrc/lang/nodejs12/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/12/16 07:42:39 adam Exp $
+# $NetBSD: Makefile,v 1.27 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	node-v12.20.0
 
@@ -18,8 +18,6 @@ CHECK_PORTABILITY_SKIP+=	deps/openssl/op
 CHECK_PORTABILITY_SKIP+=	tools/macos-installer/*
 
 .if ${MACHINE_ARCH} == "i386"
-# 64 bit atomic ops are required
-CXXFLAGS+=	-march=i586
 # required for SSE2 code under i386.
 CXXFLAGS+=	-mstackrealign
 .endif
@@ -31,4 +29,5 @@ CXXFLAGS+=	-mstackrealign
 # Requires nghttp2_option_set_max_settings
 BUILDLINK_API_DEPENDS.nghttp2+=	nghttp2>=1.41.0
 .include "../../www/nghttp2/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.247 pkgsrc/misc/libreoffice/Makefile:1.248
--- pkgsrc/misc/libreoffice/Makefile:1.247	Fri Dec  4 20:45:30 2020
+++ pkgsrc/misc/libreoffice/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.247 2020/12/04 20:45:30 nia Exp $
+# $NetBSD: Makefile,v 1.248 2020/12/31 20:04:12 nia Exp $
 
 VERREL=		7.0.3
 VERRC=		1
@@ -262,11 +262,6 @@ BUILD_MAKE_FLAGS+=	VERBOSE=true
 BUILDLINK_TRANSFORM+=	rm:-ldl
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
-# For 64 bit atomic ops (PR/54826)
-CXXFLAGS+=		-march=i586
-.endif
-
 INSTALLATION_DIRS=	bin share/applications
 
 .PHONY: debugrun
@@ -419,5 +414,5 @@ BUILDLINK_API_DEPENDS.libodfgen+=       
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/lightspark/Makefile
diff -u pkgsrc/multimedia/lightspark/Makefile:1.14 \
                pkgsrc/multimedia/lightspark/Makefile:1.15
--- pkgsrc/multimedia/lightspark/Makefile:1.14	Thu Dec  3 22:23:33 2020
+++ pkgsrc/multimedia/lightspark/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/12/03 22:23:33 nia Exp $
+# $NetBSD: Makefile,v 1.15 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	lightspark-0.8.3
 CATEGORIES=	multimedia
@@ -24,12 +24,6 @@ GCC_REQD+=	4.6
 CONF_FILES+=	${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \
 		${PKG_SYSCONFDIR}/xdg/lightspark.conf
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "powerpc"
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -48,4 +42,5 @@ CONF_FILES+=	${PREFIX}/share/examples/li
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.119 pkgsrc/multimedia/mpv/Makefile:1.120
--- pkgsrc/multimedia/mpv/Makefile:1.119	Thu Dec 24 09:28:14 2020
+++ pkgsrc/multimedia/mpv/Makefile	Thu Dec 31 20:04:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2020/12/24 09:28:14 nia Exp $
+# $NetBSD: Makefile,v 1.120 2020/12/31 20:04:12 nia Exp $
 
 DISTNAME=	mpv-0.33.0
 CATEGORIES=	multimedia
@@ -59,22 +59,10 @@ BUILDLINK_PASSTHRU_DIRS+=	${XCODE_DIR}/T
 .  endif
 .endif
 
-# 64-bit atomic operations
-# https://mail-index.netbsd.org/pkgsrc-users/2020/12/23/msg032927.html
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=	-march=i586
-CXXFLAGS+=	-march=i586
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
 post-install:
 	cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv
 
 .include "options.mk"
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/waf/waf.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -86,4 +74,5 @@ post-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/filezilla/Makefile
diff -u pkgsrc/net/filezilla/Makefile:1.132 pkgsrc/net/filezilla/Makefile:1.133
--- pkgsrc/net/filezilla/Makefile:1.132	Thu Nov  5 09:08:51 2020
+++ pkgsrc/net/filezilla/Makefile	Thu Dec 31 20:04:13 2020
@@ -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>
 .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"

Index: pkgsrc/net/freeradius/Makefile
diff -u pkgsrc/net/freeradius/Makefile:1.108 pkgsrc/net/freeradius/Makefile:1.109
--- pkgsrc/net/freeradius/Makefile:1.108	Mon Aug 31 18:10:33 2020
+++ pkgsrc/net/freeradius/Makefile	Thu Dec 31 20:04:13 2020
@@ -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"

Index: pkgsrc/net/frr/Makefile
diff -u pkgsrc/net/frr/Makefile:1.1 pkgsrc/net/frr/Makefile:1.2
--- pkgsrc/net/frr/Makefile:1.1	Thu Dec 10 16:43:24 2020
+++ pkgsrc/net/frr/Makefile	Thu Dec 31 20:04:13 2020
@@ -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

Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.34 pkgsrc/net/grpc/Makefile:1.35
--- pkgsrc/net/grpc/Makefile:1.34	Sun Dec  6 10:50:11 2020
+++ pkgsrc/net/grpc/Makefile	Thu Dec 31 20:04:13 2020
@@ -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"

Index: pkgsrc/print/qpdf/Makefile
diff -u pkgsrc/print/qpdf/Makefile:1.40 pkgsrc/print/qpdf/Makefile:1.41
--- pkgsrc/print/qpdf/Makefile:1.40	Fri Oct 30 15:13:31 2020
+++ pkgsrc/print/qpdf/Makefile	Thu Dec 31 20:04:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/10/30 15:13:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2020/12/31 20:04:13 nia Exp $
 
 DISTNAME=	qpdf-10.0.2
 CATEGORIES=	print
@@ -18,4 +18,5 @@ PKGCONFIG_OVERRIDE+=	libqpdf.pc.in
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/rsyslog/Makefile
diff -u pkgsrc/sysutils/rsyslog/Makefile:1.26 pkgsrc/sysutils/rsyslog/Makefile:1.27
--- pkgsrc/sysutils/rsyslog/Makefile:1.26	Fri May 22 10:56:40 2020
+++ pkgsrc/sysutils/rsyslog/Makefile	Thu Dec 31 20:04:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/05/22 10:56:40 adam Exp $
+# $NetBSD: Makefile,v 1.27 2020/12/31 20:04:13 nia Exp $
 #
 
 BUILDLINK_DEPMETHOD.libestr=	full
@@ -32,11 +32,6 @@ PLIST.klog=		yes
 RSYSLOG_SYSMOD=		imklog
 .endif
 
-# needs to be able to do compare-and-swap on time_t (cmpxchg8b)
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=		-march=i586
-.endif
-
 BUILDLINK_TRANSFORM.Darwin+=	rm:-luuid
 
 BUILD_DEFS+=		VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR
@@ -70,4 +65,5 @@ post-install:
 
 BUILDLINK_API_DEPENDS.liblognorm+=	liblognorm>=2.0.3
 .include "../../sysutils/liblognorm/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.191 \
                pkgsrc/www/firefox/mozilla-common.mk:1.192
--- pkgsrc/www/firefox/mozilla-common.mk:1.191	Thu Dec 17 09:53:15 2020
+++ pkgsrc/www/firefox/mozilla-common.mk	Thu Dec 31 20:04:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.191 2020/12/17 09:53:15 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.192 2020/12/31 20:04:13 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -48,9 +48,8 @@ test:
 TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
+
 .if ${MACHINE_ARCH} == "i386"
-# Fix for PR pkg/48152.
-CXXFLAGS+=		-march=i586
 # This is required for SSE2 code under i386.
 CXXFLAGS+=		-mstackrealign
 .endif
@@ -155,11 +154,7 @@ CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyw
 # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
 CONFIGURE_ENV.NetBSD+=	ac_cv_clock_monotonic=
 
-# PR pkg/55456
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-.include "../../devel/libatomic/buildlink3.mk"
-CONFIGURE_ENV.NetBSD+=	ac_cv_needs_atomic=yes
-.endif
+.include "../../mk/atomic64.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.12 \
                pkgsrc/www/firefox52/mozilla-common.mk:1.13
--- pkgsrc/www/firefox52/mozilla-common.mk:1.12	Wed Dec 23 08:20:04 2020
+++ pkgsrc/www/firefox52/mozilla-common.mk	Thu Dec 31 20:04:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.12 2020/12/23 08:20:04 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.13 2020/12/31 20:04:13 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -33,8 +33,6 @@ TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
 .if ${MACHINE_ARCH} == "i386"
-# Fix for PR pkg/48152.
-CXXFLAGS+=		-march=i586
 # This is required for SSE2 code under i386.
 CXXFLAGS+=		-mstackrealign
 .endif
@@ -140,6 +138,7 @@ PYTHON_VERSIONS_ACCEPTED=	27
 PYTHON_FOR_BUILD_ONLY=		tool
 TOOL_DEPENDS+=			${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+.include "../../mk/atomic64.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"

Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.16 \
                pkgsrc/www/firefox68/mozilla-common.mk:1.17
--- pkgsrc/www/firefox68/mozilla-common.mk:1.16	Thu Nov 12 10:03:24 2020
+++ pkgsrc/www/firefox68/mozilla-common.mk	Thu Dec 31 20:04:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.16 2020/11/12 10:03:24 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.17 2020/12/31 20:04:14 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -58,8 +58,6 @@ USE_TOOLS+=		bsdtar
 USE_PKGSRC_GCC_RUNTIME=	yes
 .endif
 .if ${MACHINE_ARCH} == "i386"
-# Fix for PR pkg/48152.
-CXXFLAGS+=		-march=i586
 # This is required for SSE2 code under i386.
 CXXFLAGS+=		-mstackrealign
 .endif
@@ -167,6 +165,7 @@ CONFIGURE_ENV.NetBSD+=	ac_cv_clock_monot
 PREFER.bzip2?=	pkgsrc
 .endif
 
+.include "../../mk/atomic64.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"

Index: pkgsrc/www/firefox78/mozilla-common.mk
diff -u pkgsrc/www/firefox78/mozilla-common.mk:1.6 \
                pkgsrc/www/firefox78/mozilla-common.mk:1.7
--- pkgsrc/www/firefox78/mozilla-common.mk:1.6	Mon Nov 16 20:21:29 2020
+++ pkgsrc/www/firefox78/mozilla-common.mk	Thu Dec 31 20:04:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2020/11/16 20:21:29 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2020/12/31 20:04:14 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -49,8 +49,6 @@ TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
 .if ${MACHINE_ARCH} == "i386"
-# Fix for PR pkg/48152.
-CXXFLAGS+=		-march=i586
 # This is required for SSE2 code under i386.
 CXXFLAGS+=		-mstackrealign
 .endif
@@ -163,11 +161,7 @@ CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyw
 # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
 CONFIGURE_ENV.NetBSD+=	ac_cv_clock_monotonic=
 
-# PR pkg/55456
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-.include "../../devel/libatomic/buildlink3.mk"
-CONFIGURE_ENV.NetBSD+=	ac_cv_needs_atomic=yes
-.endif
+.include "../../mk/atomic64.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"

Index: pkgsrc/www/seamonkey/mozilla-common.mk
diff -u pkgsrc/www/seamonkey/mozilla-common.mk:1.6 \
                pkgsrc/www/seamonkey/mozilla-common.mk:1.7
--- pkgsrc/www/seamonkey/mozilla-common.mk:1.6	Wed Dec 23 08:19:30 2020
+++ pkgsrc/www/seamonkey/mozilla-common.mk	Thu Dec 31 20:04:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2020/12/23 08:19:30 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2020/12/31 20:04:14 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -54,8 +54,6 @@ TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
 .if ${MACHINE_ARCH} == "i386"
-# Fix for PR pkg/48152.
-CXXFLAGS+=		-march=i586
 # This is required for SSE2 code under i386.
 CXXFLAGS+=		-mstackrealign
 .endif
@@ -200,6 +198,7 @@ PLIST_SUBST+=	DLL_SUFFIX=".dylib"
 PLIST_SUBST+=	DLL_SUFFIX=".so"
 .endif
 
+.include "../../mk/atomic64.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.199 pkgsrc/www/webkit-gtk/Makefile:1.200
--- pkgsrc/www/webkit-gtk/Makefile:1.199	Tue Dec 15 17:59:00 2020
+++ pkgsrc/www/webkit-gtk/Makefile	Thu Dec 31 20:04:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.199 2020/12/15 17:59:00 leot Exp $
+# $NetBSD: Makefile,v 1.200 2020/12/31 20:04:14 nia Exp $
 
 DISTNAME=	webkitgtk-2.30.4
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -155,4 +155,5 @@ BUILDLINK_API_DEPENDS.libsoup+= libsoup>
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/webkit24-gtk/Makefile.common
diff -u pkgsrc/www/webkit24-gtk/Makefile.common:1.19 \
                pkgsrc/www/webkit24-gtk/Makefile.common:1.20
--- pkgsrc/www/webkit24-gtk/Makefile.common:1.19	Fri Nov  6 15:30:10 2020
+++ pkgsrc/www/webkit24-gtk/Makefile.common	Thu Dec 31 20:04:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2020/11/06 15:30:10 nia Exp $
+# $NetBSD: Makefile.common,v 1.20 2020/12/31 20:04:14 nia Exp $
 # used by www/webkit24-gtk/Makefile
 # used by www/webkit24-gtk3/Makefile
 
@@ -83,6 +83,7 @@ CPPFLAGS+=		-DUSE_SYSTEM_MALLOC
 LDFLAGS+=	-Wl,-no-keep-memory -Wl,-reduce-memory
 .endif
 
+.include "../../mk/atomic64.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.84 pkgsrc/x11/qt5-qtwebkit/Makefile:1.85
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.84	Sat Nov 21 23:13:11 2020
+++ pkgsrc/x11/qt5-qtwebkit/Makefile	Thu Dec 31 20:04:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2020/11/21 23:13:11 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2020/12/31 20:04:14 nia Exp $
 
 QTWKVERSION=	5.212.0-alpha4
 DISTNAME=	qtwebkit-${QTWKVERSION}
@@ -73,11 +73,6 @@ BUILDLINK_TRANSFORM+=	rpath:${WRKSRC}/li
 LDFLAGS+=	-Wl,--no-keep-memory
 .endif
 
-# 64-bit atomic ops are required
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS+=	-march=i586
-.endif
-
 post-install:
 .for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
 	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
@@ -108,4 +103,5 @@ BUILDLINK_DEPMETHOD.${RUBY_BASE}=	build
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/mk/atomic64.mk
diff -u /dev/null pkgsrc/mk/atomic64.mk:1.1
--- /dev/null	Thu Dec 31 20:04:15 2020
+++ pkgsrc/mk/atomic64.mk	Thu Dec 31 20:04:12 2020
@@ -0,0 +1,24 @@
+# $NetBSD: atomic64.mk,v 1.1 2020/12/31 20:04:12 nia Exp $
+#
+# This Makefile fragment is included by packages that require 64-bit atomic
+# operations, and will attempt to set the appropriate architecture-specific
+# compiler flags.
+
+.if !defined(ATOMIC64_MK)
+
+ATOMIC64_MK:=
+
+.include "../../bsd.fast.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+.  if empty(CFLAGS:M*march=*)
+CFLAGS+=	-march=i586
+CXXFLAGS+=	-march=i586
+.  endif
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+.  include "../../devel/libatomic/buildlink3.mk"
+.endif
+
+.endif


--_----------=_1609445055287620--


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic