diff options
| author | spz <spz> | 2015-10-08 00:12:56 +0000 |
|---|---|---|
| committer | spz <spz> | 2015-10-08 00:12:56 +0000 |
| commit | 65ab34676de31bfc624addb6da8831cac2366917 (patch) | |
| tree | cf58ad7832beccfc2b121f8ab6c00d8511abd050 /www | |
| parent | ca54c820a839e2fe6c59e9d96618b34bfcf708ad (diff) | |
| download | pkgsrc-65ab34676de31bfc624addb6da8831cac2366917.tar.gz | |
Pullup ticket #4835 - requested by leot
www/webkit-gtk: build fix
Revisions pulled up:
- www/webkit-gtk/Makefile 1.99
- www/webkit-gtk/hacks.mk 1.1
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: leot
Date: Mon Oct 5 16:25:30 UTC 2015
Modified Files:
pkgsrc/www/webkit-gtk: Makefile
Added Files:
pkgsrc/www/webkit-gtk: hacks.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/webkit-gtk/hacks.mk
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit-gtk/Makefile | 4 | ||||
| -rw-r--r-- | www/webkit-gtk/hacks.mk | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 183f3954a84..fe4660aef4a 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.97 2015/08/23 14:30:42 wiz Exp $ +# $NetBSD: Makefile,v 1.97.2.1 2015/10/08 00:12:56 spz Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "Makefile.common" PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} diff --git a/www/webkit-gtk/hacks.mk b/www/webkit-gtk/hacks.mk new file mode 100644 index 00000000000..88075d0f8c1 --- /dev/null +++ b/www/webkit-gtk/hacks.mk @@ -0,0 +1,17 @@ +# $NetBSD: hacks.mk,v 1.1.2.2 2015/10/08 00:12:56 spz 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 + |