CVS commit: [pkgsrc-2020Q1] pkgsrc/net/qbittorrent

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jun 17 13:38:14 UTC 2020

Modified Files:
        pkgsrc/net/qbittorrent [pkgsrc-2020Q1]: Makefile

Log Message:
Pullup ticket #6239 - requested by nia
net/qbittorrent: i386 build fix

Revisions pulled up:
- net/qbittorrent/Makefile                                      1.14

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat Jun 13 11:21:29 UTC 2020

   Modified Files:
        pkgsrc/net/qbittorrent: Makefile

   Log Message:
   qbittorrent: needs 64-bit atomic ops


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/net/qbittorrent/Makefile

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

Modified files:

Index: pkgsrc/net/qbittorrent/Makefile
diff -u pkgsrc/net/qbittorrent/Makefile:1.6 pkgsrc/net/qbittorrent/Makefile:1.6.2.1
--- pkgsrc/net/qbittorrent/Makefile:1.6 Tue Mar 10 22:10:47 2020
+++ pkgsrc/net/qbittorrent/Makefile     Wed Jun 17 13:38:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/03/10 22:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2020/06/17 13:38:14 bsiegert Exp $
 
 DISTNAME=      qbittorrent-4.2.1
 PKGREVISION=   4
@@ -16,11 +16,17 @@ USE_CMAKE=  yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-# C++11
-GCC_REQD+=     4.7
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 
+GCC_REQD+=     6 # c++14
+
+.include "../../mk/bsd.prefs.mk"
+
+# 64 bit atomic ops are required
+.if ${MACHINE_ARCH} == "i386"
+CXXFLAGS+=             -march=i586
+.endif
+
 LDFLAGS.NetBSD+=       -ljemalloc
 
 .include "../../devel/boost-libs/buildlink3.mk"