Fri Dec 20 00:00:55 2019 UTC ()
Fix popcount conflict on NetBSD. Avoid LTO and 32bit binaries on NetBSD.


(joerg)
diff -r1.1 -r1.2 pkgsrc/games/stockfish/Makefile
diff -r1.1 -r1.2 pkgsrc/games/stockfish/distinfo
diff -r0 -r1.1 pkgsrc/games/stockfish/patches/patch-pawns.cpp
cvs diff -r1.1 -r1.2 pkgsrc/games/stockfish/Makefile (expand / switch to unified diff)

--- pkgsrc/games/stockfish/Makefile 2018/02/28 22:20:43 1.1
+++ pkgsrc/games/stockfish/Makefile 2019/12/20 00:00:55 1.2
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.1 2018/02/28 22:20:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2019/12/20 00:00:55 joerg Exp $
2 2
3DISTNAME= stockfish-9-src 3DISTNAME= stockfish-9-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= https://stockfish.s3.amazonaws.com/ 6MASTER_SITES= https://stockfish.s3.amazonaws.com/
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://stockfishchess.org/ 10HOMEPAGE= https://stockfishchess.org/
11COMMENT= Strong open source chess engine 11COMMENT= Strong open source chess engine
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14WRKSRC= ${WRKDIR}/src 14WRKSRC= ${WRKDIR}/src
15USE_LANGUAGES= c++ 15USE_LANGUAGES= c++
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17 17
18INSTALLATION_DIRS= bin share/doc/stockfish 18INSTALLATION_DIRS= bin share/doc/stockfish
19 19
 20BUILDLINK_TRANSFORM.NetBSD+= rm:-flto rm:-m32
 21
20do-install: 22do-install:
21 ${INSTALL_PROGRAM} ${WRKSRC}/stockfish ${DESTDIR}${PREFIX}/bin 23 ${INSTALL_PROGRAM} ${WRKSRC}/stockfish ${DESTDIR}${PREFIX}/bin
22 ${INSTALL_DATA} ${WRKDIR}/Readme.md ${DESTDIR}${PREFIX}/share/doc/stockfish 24 ${INSTALL_DATA} ${WRKDIR}/Readme.md ${DESTDIR}${PREFIX}/share/doc/stockfish
23 25
24.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/games/stockfish/distinfo (expand / switch to unified diff)

--- pkgsrc/games/stockfish/distinfo 2018/02/28 22:20:43 1.1
+++ pkgsrc/games/stockfish/distinfo 2019/12/20 00:00:55 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2018/02/28 22:20:43 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2019/12/20 00:00:55 joerg Exp $
2 2
3SHA1 (stockfish-9-src.zip) = c30ccc1c077c6817a101ed36ebaee9dcd43db879 3SHA1 (stockfish-9-src.zip) = c30ccc1c077c6817a101ed36ebaee9dcd43db879
4RMD160 (stockfish-9-src.zip) = 7002a4050f71b7a33888460ea552d0063d6c761b 4RMD160 (stockfish-9-src.zip) = 7002a4050f71b7a33888460ea552d0063d6c761b
5SHA512 (stockfish-9-src.zip) = 47b5dfea9e015dd68e33c8b1a131ed83710e4e5d67abe0c278a423f2940b07c7a5d661ce27915257ae3dad83fc2bb8e50d3d28bfa11a7c4cdf396d0378cd80f8 5SHA512 (stockfish-9-src.zip) = 47b5dfea9e015dd68e33c8b1a131ed83710e4e5d67abe0c278a423f2940b07c7a5d661ce27915257ae3dad83fc2bb8e50d3d28bfa11a7c4cdf396d0378cd80f8
6Size (stockfish-9-src.zip) = 171925 bytes 6Size (stockfish-9-src.zip) = 171925 bytes
 7SHA1 (patch-pawns.cpp) = d643c725310a723151e2af3d5dd6eaae0dddf105
File Added: pkgsrc/games/stockfish/patches/patch-pawns.cpp
$NetBSD: patch-pawns.cpp,v 1.1 2019/12/20 00:00:55 joerg Exp $

--- pawns.cpp.orig	2019-12-19 22:50:55.102229747 +0000
+++ pawns.cpp
@@ -223,8 +223,8 @@ Entry* probe(const Position& pos) {
 
   e->key = key;
   e->score = evaluate<WHITE>(pos, e) - evaluate<BLACK>(pos, e);
-  e->asymmetry = popcount(e->semiopenFiles[WHITE] ^ e->semiopenFiles[BLACK]);
-  e->openFiles = popcount(e->semiopenFiles[WHITE] & e->semiopenFiles[BLACK]);
+  e->asymmetry = popcount(Bitboard(e->semiopenFiles[WHITE] ^ e->semiopenFiles[BLACK]));
+  e->openFiles = popcount(Bitboard(e->semiopenFiles[WHITE] & e->semiopenFiles[BLACK]));
   return e;
 }