CVS commit: pkgsrc/games/stockfish

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Dec 20 00:00:55 UTC 2019

Modified Files:
        pkgsrc/games/stockfish: Makefile distinfo
Added Files:
        pkgsrc/games/stockfish/patches: patch-pawns.cpp

Log Message:
Fix popcount conflict on NetBSD. Avoid LTO and 32bit binaries on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/stockfish/Makefile \
    pkgsrc/games/stockfish/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/stockfish/patches/patch-pawns.cpp

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

Modified files:

Index: pkgsrc/games/stockfish/Makefile
diff -u pkgsrc/games/stockfish/Makefile:1.1 pkgsrc/games/stockfish/Makefile:1.2
--- pkgsrc/games/stockfish/Makefile:1.1 Wed Feb 28 22:20:43 2018
+++ pkgsrc/games/stockfish/Makefile     Fri Dec 20 00:00:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/02/28 22:20:43 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/12/20 00:00:55 joerg Exp $
 
 DISTNAME=      stockfish-9-src
 PKGNAME=       ${DISTNAME:S/-src//}
@@ -17,6 +17,8 @@ USE_TOOLS+=   gmake
 
 INSTALLATION_DIRS=     bin share/doc/stockfish
 
+BUILDLINK_TRANSFORM.NetBSD+=   rm:-flto rm:-m32
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/stockfish ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKDIR}/Readme.md ${DESTDIR}${PREFIX}/share/doc/stockfish
Index: pkgsrc/games/stockfish/distinfo
diff -u pkgsrc/games/stockfish/distinfo:1.1 pkgsrc/games/stockfish/distinfo:1.2
--- pkgsrc/games/stockfish/distinfo:1.1 Wed Feb 28 22:20:43 2018
+++ pkgsrc/games/stockfish/distinfo     Fri Dec 20 00:00:55 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/02/28 22:20:43 wiz Exp $
+$NetBSD: distinfo,v 1.2 2019/12/20 00:00:55 joerg Exp $
 
 SHA1 (stockfish-9-src.zip) = c30ccc1c077c6817a101ed36ebaee9dcd43db879
 RMD160 (stockfish-9-src.zip) = 7002a4050f71b7a33888460ea552d0063d6c761b
 SHA512 (stockfish-9-src.zip) = 47b5dfea9e015dd68e33c8b1a131ed83710e4e5d67abe0c278a423f2940b07c7a5d661ce27915257ae3dad83fc2bb8e50d3d28bfa11a7c4cdf396d0378cd80f8
 Size (stockfish-9-src.zip) = 171925 bytes
+SHA1 (patch-pawns.cpp) = d643c725310a723151e2af3d5dd6eaae0dddf105

Added files:

Index: pkgsrc/games/stockfish/patches/patch-pawns.cpp
diff -u /dev/null pkgsrc/games/stockfish/patches/patch-pawns.cpp:1.1
--- /dev/null   Fri Dec 20 00:00:55 2019
+++ pkgsrc/games/stockfish/patches/patch-pawns.cpp      Fri Dec 20 00:00:55 2019
@@ -0,0 +1,15 @@
+$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;
+ }
+