Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715758666189970"
MIME-Version: 1.0
Date: Wed, 15 May 2024 07:37:46 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240515073746.B1072FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Wed May 15 07:37:46 UTC 2024

Modified Files:
	pkgsrc/mk: atomic64.mk

Log Message:
atomic64: Limit libatomic dependency to NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mk/atomic64.mk

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


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

Modified files:

Index: pkgsrc/mk/atomic64.mk
diff -u pkgsrc/mk/atomic64.mk:1.8 pkgsrc/mk/atomic64.mk:1.9
--- pkgsrc/mk/atomic64.mk:1.8	Thu Dec 22 10:52:52 2022
+++ pkgsrc/mk/atomic64.mk	Wed May 15 07:37:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: atomic64.mk,v 1.8 2022/12/22 10:52:52 he Exp $
+# $NetBSD: atomic64.mk,v 1.9 2024/05/15 07:37:46 nia Exp $
 #
 # This Makefile fragment is included by packages that require 64-bit atomic
 # operations, and will attempt to set the appropriate architecture-specific
@@ -16,13 +16,15 @@ CFLAGS+=	-march=i586
 .  endif
 .endif
 
-.if ${MACHINE_ARCH} == "m68k" || \
+# Non-NetBSD vendors tend to include libatomic as part of gcc.
+.if ${OPSYS} == "NetBSD" && \
+    (${MACHINE_ARCH} == "m68k" || \
     ${MACHINE_ARCH} == "mipsel" || \
     ${MACHINE_ARCH} == "mipseb" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "vax" || \
-    !empty(MACHINE_ARCH:Mearm*)
+    !empty(MACHINE_ARCH:Mearm*))
 .  include "../../devel/libatomic/buildlink3.mk"
 .endif
 

--_----------=_1715758666189970--