stockfish: update to 15.1

This commit is contained in:
shtayerc 2022-12-20 19:16:45 +01:00 committed by Leah Neukirchen
parent 1d2b2c28f5
commit cf8aa04b9b
3 changed files with 51 additions and 10 deletions

View File

@ -0,0 +1,40 @@
From 61ea1534ff7026009a3435575c7beee91534db83 Mon Sep 17 00:00:00 2001
From: Joost VandeVondele <Joost.VandeVondele@gmail.com>
Date: Mon, 19 Dec 2022 17:54:36 +0100
Subject: [PATCH] No error if net available but wget/curl missing
do not error out on missing wget/curl if these tools are not needed later on,
i.e. if the net is available already.
closes https://github.com/official-stockfish/Stockfish/pull/4291
closes https://github.com/official-stockfish/Stockfish/pull/4253
No functional change
---
src/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index da81ceb4a0..bcf0abdf5e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -853,7 +853,7 @@ net:
$(eval nnuedownloadurl2 := https://github.com/official-stockfish/networks/raw/master/$(nnuenet))
$(eval curl_or_wget := $(shell if hash curl 2>/dev/null; then echo "curl -skL"; elif hash wget 2>/dev/null; then echo "wget -qO-"; fi))
@if [ "x$(curl_or_wget)" = "x" ]; then \
- echo "Automatic download failed: neither curl nor wget is installed. Install one of these tools or download the net manually"; exit 1; \
+ echo "Neither curl nor wget is installed. Install one of these tools unless the net has been downloaded manually"; \
fi
$(eval shasum_command := $(shell if hash shasum 2>/dev/null; then echo "shasum -a 256 "; elif hash sha256sum 2>/dev/null; then echo "sha256sum "; fi))
@if [ "x$(shasum_command)" = "x" ]; then \
@@ -864,7 +864,9 @@ net:
echo "$(nnuenet) available."; \
else \
if [ "x$(curl_or_wget)" != "x" ]; then \
- echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\
+ echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\
+ else \
+ echo "No net found and download not possible"; exit 1;\
fi; \
fi; \
if [ "x$(shasum_command)" != "x" ]; then \

View File

@ -1,17 +1,19 @@
--- a/src/Makefile 2020-09-02 21:19:30.000000000 +0700
+++ b/src/Makefile 2021-01-14 18:51:25.852600109 +0700
@@ -306,26 +306,7 @@
--- a/src/Makefile 2022-12-04 14:17:15.000000000 +0100
+++ b/src/Makefile 2022-12-05 16:52:13.648959706 +0100
@@ -366,27 +366,5 @@ endif
ifeq ($(COMP),gcc)
comp=gcc
- CXX=g++
CXXFLAGS += -pedantic -Wextra -Wshadow
-
- ifeq ($(arch),$(filter $(arch),armv7 armv8))
- ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64))
- ifeq ($(OS),Android)
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
- endif
- ifeq ($(ARCH),riscv64)
- CXXFLAGS += -latomic
- endif
- else
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
@ -26,4 +28,3 @@
- endif
endif
ifeq ($(COMP),mingw)

View File

@ -1,8 +1,8 @@
# Template file for 'stockfish'
pkgname=stockfish
version=15
version=15.1
revision=1
_net_file=nn-6877cd24400e.nnue
_net_file=nn-ad9b42354671.nnue
build_wrksrc=src
build_style=gnu-makefile
make_build_target=build
@ -14,8 +14,8 @@ license="GPL-3.0-or-later"
homepage="http://stockfishchess.org/"
distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
https://tests.stockfishchess.org/api/nn/${_net_file}"
checksum="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983
6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3"
checksum="d4272657905319328294355973faee40a8c28e3eecb0e7b266ed34ff33383b76
ad9b423546714137916bd38978af6fd68d7b8951bef25ff76bf43da72d6cb786"
skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"