pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xoreos: convert to using mk/atomic64.mk.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sat Aug 6 19:33:34 2022 +0200
Changeset:	9d69d90fd6613881211975e4ba23a6b3594ea553

Modified Files:
	xoreos/Makefile
Removed Files:
	xoreos/hacks.mk

Log Message:
xoreos: convert to using mk/atomic64.mk.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9d69d90fd6613881211975e4ba23a6b3594ea553

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

diffstat:
 xoreos/Makefile |  1 +
 xoreos/hacks.mk | 23 -----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diffs:
diff --git a/xoreos/Makefile b/xoreos/Makefile
index 990ea1c33a..4fff229e36 100644
--- a/xoreos/Makefile
+++ b/xoreos/Makefile
@@ -45,4 +45,5 @@ do-install:
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xoreos/hacks.mk b/xoreos/hacks.mk
deleted file mode 100644
index ae075f74e0..0000000000
--- a/xoreos/hacks.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD$
-
-.if !defined(XOREOS_HACKS_MK)
-XOREOS_HACKS_MK=	defined
-
-# [Tue Dec 15 15:49:14 SAST 2020 : yhardy]
-# On i386 archs src/common/uuid.cpp fails to compile because 64-bit
-# atomic operations are needed. Forcing -march=i586 (or better) avoids
-# that (i[56]86 provide required).
-.if ${MACHINE_ARCH} == "i386"
-PKG_HACKS+=	i386-atomicops
-CXXFLAGS+=	-march=i586
-.endif
-
-# [Tue Dec 15 15:49:14 SAST 2020 : yhardy]
-# On NetBSD/powerpc, we don't have native 8-byte atomics, but xoreos
-# needs it for a global uint64_t  UID, so here we need libatomic.
-.if ${MACHINE_ARCH} == "powerpc"
-PKG_HACKS+=     powerpc-libatomic
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
-.endif	# XOREOS_HACKS_MK


Home | Main Index | Thread Index | Old Index