pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtwebkit qt5-qtwebkit: build fix for 32-bit x86



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7282feaa8c09
branches:  trunk
changeset: 397026:7282feaa8c09
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Fri Jun 14 23:10:54 2019 +0000

description:
qt5-qtwebkit: build fix for 32-bit x86

This now requires 64-bit atomic ops, handle accordingly. (XXX: as with
other packages, this will presumably also break on other architectures
as a result, e.g. macppc.)

diffstat:

 x11/qt5-qtwebkit/Makefile |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r c86cf31abfe4 -r 7282feaa8c09 x11/qt5-qtwebkit/Makefile
--- a/x11/qt5-qtwebkit/Makefile Fri Jun 14 22:32:06 2019 +0000
+++ b/x11/qt5-qtwebkit/Makefile Fri Jun 14 23:10:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2019/04/25 07:33:32 maya Exp $
+# $NetBSD: Makefile,v 1.62 2019/06/14 23:10:54 gutteridge Exp $
 
 DISTNAME=      qtwebkit-${QTWKVERSION}
 PKGNAME=       qt5-qtwebkit-${QTWKVERSION:S/-/./}
@@ -87,6 +87,11 @@
 LDFLAGS+=      -Wl,-no-keep-memory -Wl-reduce-memory
 .endif
 
+# 64-bit atomic ops are required
+.if ${MACHINE_ARCH} == "i386"
+CXXFLAGS+=     -march=i586
+.endif
+
 post-install:
 .for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
        cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \



Home | Main Index | Thread Index | Old Index