pkgsrc-WIP-changes archive

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

webkit-gtk4: 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:32:37 2022 +0200
Changeset:	b6fbc3515acc5286e8b80b5883cc7f9b3552d69a

Modified Files:
	webkit-gtk4/Makefile
Removed Files:
	webkit-gtk4/hacks.mk

Log Message:
webkit-gtk4: 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=b6fbc3515acc5286e8b80b5883cc7f9b3552d69a

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

diffstat:
 webkit-gtk4/Makefile |  1 +
 webkit-gtk4/hacks.mk | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diffs:
diff --git a/webkit-gtk4/Makefile b/webkit-gtk4/Makefile
index 75b5a4a167..87921f24d5 100644
--- a/webkit-gtk4/Makefile
+++ b/webkit-gtk4/Makefile
@@ -165,4 +165,5 @@ BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/webkit-gtk4/hacks.mk b/webkit-gtk4/hacks.mk
deleted file mode 100644
index 94abdb9a7d..0000000000
--- a/webkit-gtk4/hacks.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2020/09/11 09:21:32 he Exp $
-
-.if !defined(WEBKIT_GTK_HACKS_MK)
-WEBKIT_GTK_HACKS_MK=	defined
-
-# [Sat Oct  3 16:44:53 CEST 2015 : leot]
-# On i386 archs -latomic is added during the build phase when linking
-# libwebkit2gtk-4.0.so for atomic operations.
-# Forcing -march=i586 (or better) avoids that (i[56]86 provide required
-# 64-bit compare-and-swap instruction).
-.if ${MACHINE_ARCH} == "i386"
-PKG_HACKS+=	i386-atomicops
-CXXFLAGS+=	-march=i586
-.endif
-
-# [Mon Sep  7 20:40:36 CEST 2020 : he]
-# On NetBSD/powerpc, we don't have native 8-byte atomics,
-# but webkit-gtk insists on using them, so here we need libatomic.
-# (This is a trial balloon -- let's see if autoconf will pick it up...)
-.if ${MACHINE_ARCH} == "powerpc"
-PKG_HACKS+=     powerpc-libatomic
-.include "../../devel/libatomic/buildlink3.mk"
-.endif
-
-.endif	# WEBKIT_GTK_HACKS_MK


Home | Main Index | Thread Index | Old Index