diff options
| author | leot <leot@pkgsrc.org> | 2015-10-05 16:25:30 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2015-10-05 16:25:30 +0000 |
| commit | 6cb0fae2740defee382867570af6810e3e355b74 (patch) | |
| tree | 231768b5913c5aad2c98a9d048ca1b606bb37fdb /www | |
| parent | 758eb9784cba35f1b6de09e200d3e0f6d8f6959e (diff) | |
| download | pkgsrc-6cb0fae2740defee382867570af6810e3e355b74.tar.gz | |
Add a workaround and fixes PR pkg/50284 forcing building webkit-gtk with
-march=i586 in order to avoid on i386 the "-latomic" flag when linking
libwebkit2gtk-4.0.so.
Bump PKGREVISION.
Thanks joerg@, jperkin@ and tnn@ for various suggestions.
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit-gtk/Makefile | 3 | ||||
| -rw-r--r-- | www/webkit-gtk/hacks.mk | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 872479b18e9..b2696c9f9a8 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.98 2015/09/26 10:16:37 leot Exp $ +# $NetBSD: Makefile,v 1.99 2015/10/05 16:25:30 leot Exp $ DISTNAME= webkitgtk-2.10.0 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.webkitgtk.org/releases/ EXTRACT_SUFX= .tar.xz diff --git a/www/webkit-gtk/hacks.mk b/www/webkit-gtk/hacks.mk new file mode 100644 index 00000000000..e0d28b84943 --- /dev/null +++ b/www/webkit-gtk/hacks.mk @@ -0,0 +1,16 @@ +# $NetBSD: hacks.mk,v 1.1 2015/10/05 16:25:30 leot 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 + +.endif # WEBKIT_GTK_HACKS_MK |