* [PR PATCH] stockfish: use upstream's cxxflags, fix ftbfs
@ 2021-01-14 1:37 sgn
2021-01-14 1:50 ` [PR PATCH] [Updated] " sgn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: sgn @ 2021-01-14 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages stockfish-fix-ftbfs
https://github.com/void-linux/void-packages/pull/27910
stockfish: use upstream's cxxflags, fix ftbfs
A patch file from https://github.com/void-linux/void-packages/pull/27910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stockfish-fix-ftbfs-27910.patch --]
[-- Type: text/x-diff, Size: 1197 bytes --]
From ceed0b3924275d56e6165bab1f4830bbc359d3ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 14 Jan 2021 08:35:01 +0700
Subject: [PATCH] stockfish: use upstream's cxxflags, fix ftbfs
---
srcpkgs/stockfish/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 8e0225e0df7..8fa3f79ae14 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,12 +1,13 @@
# Template file for 'stockfish'
pkgname=stockfish
version=12
-revision=1
+revision=2
_net_file=nn-82215d0fd0df.nnue
wrksrc="Stockfish-sf_${version}"
build_wrksrc=src
build_style=gnu-makefile
make_build_target=build
+make_use_env=yes
hostmakedepends="tar"
short_desc="Free UCI chess engine derived from Glaurung"
maintainer="cipr3s <cipr3s@gmx.com>"
@@ -20,6 +21,9 @@ skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
+# We know how to optimize ourselves
+make_build_args="optimize=no "
+
case $XBPS_TARGET_MACHINE in
x86_64*) make_build_args+="ARCH=x86-64" ;;
i686*) make_build_args+="ARCH=x86-32" ;;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] stockfish: use upstream's cxxflags, fix ftbfs
2021-01-14 1:37 [PR PATCH] stockfish: use upstream's cxxflags, fix ftbfs sgn
@ 2021-01-14 1:50 ` sgn
2021-01-14 11:54 ` sgn
2021-01-14 11:58 ` [PR PATCH] [Merged]: " sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-01-14 1:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages stockfish-fix-ftbfs
https://github.com/void-linux/void-packages/pull/27910
stockfish: use upstream's cxxflags, fix ftbfs
A patch file from https://github.com/void-linux/void-packages/pull/27910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stockfish-fix-ftbfs-27910.patch --]
[-- Type: text/x-diff, Size: 1652 bytes --]
From a9bdc81c613bab1032ec6d27efcb699bdbd9fba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 14 Jan 2021 08:35:01 +0700
Subject: [PATCH] stockfish: use upstream's cxxflags, fix ftbfs
---
srcpkgs/stockfish/template | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 8e0225e0df7..f0eee9b20f9 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,12 +1,13 @@
# Template file for 'stockfish'
pkgname=stockfish
version=12
-revision=1
+revision=2
_net_file=nn-82215d0fd0df.nnue
wrksrc="Stockfish-sf_${version}"
build_wrksrc=src
build_style=gnu-makefile
make_build_target=build
+make_use_env=yes
hostmakedepends="tar"
short_desc="Free UCI chess engine derived from Glaurung"
maintainer="cipr3s <cipr3s@gmx.com>"
@@ -20,6 +21,9 @@ skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
+# We know how to optimize ourselves
+make_build_args="optimize=no "
+
case $XBPS_TARGET_MACHINE in
x86_64*) make_build_args+="ARCH=x86-64" ;;
i686*) make_build_args+="ARCH=x86-32" ;;
@@ -28,6 +32,7 @@ case $XBPS_TARGET_MACHINE in
armv7*) make_build_args+="ARCH=armv7" ;;
ppc64*) make_build_args+="ARCH=ppc-64" ;;
ppc*) make_build_args+="ARCH=ppc-32" ;;
+ *) broken="Not supported" ;;
esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -39,6 +44,10 @@ post_extract() {
cp $XBPS_SRCDISTDIR/${pkgname}-${version}/${_net_file} ./src
}
+post_patch() {
+ vsed -i -e '/CXX=/d' Makefile
+}
+
do_install() {
vbin stockfish
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] stockfish: use upstream's cxxflags, fix ftbfs
2021-01-14 1:37 [PR PATCH] stockfish: use upstream's cxxflags, fix ftbfs sgn
2021-01-14 1:50 ` [PR PATCH] [Updated] " sgn
@ 2021-01-14 11:54 ` sgn
2021-01-14 11:58 ` [PR PATCH] [Merged]: " sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-01-14 11:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages stockfish-fix-ftbfs
https://github.com/void-linux/void-packages/pull/27910
stockfish: use upstream's cxxflags, fix ftbfs
A patch file from https://github.com/void-linux/void-packages/pull/27910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stockfish-fix-ftbfs-27910.patch --]
[-- Type: text/x-diff, Size: 2672 bytes --]
From 0383ec37200b6e760a5e44a48744bb18dfd41ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 14 Jan 2021 08:35:01 +0700
Subject: [PATCH] stockfish: use upstream's cxxflags, fix ftbfs
---
srcpkgs/stockfish/patches/makefile.patch | 33 ++++++++++++++++++------
srcpkgs/stockfish/template | 9 +++++--
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch
index 00b7ef3c84b..b5fc75e7a0a 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,12 +1,29 @@
---- src/Makefile.orig
-+++ src/Makefile
-@@ -159,9 +159,6 @@
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
- endif
+--- src/Makefile.orig 2020-09-02 21:19:30.000000000 +0700
++++ src/Makefile 2021-01-14 18:51:25.852600109 +0700
+@@ -306,26 +306,7 @@
+
+ ifeq ($(COMP),gcc)
+ comp=gcc
+- CXX=g++
+ CXXFLAGS += -pedantic -Wextra -Wshadow
+-
+- ifeq ($(arch),$(filter $(arch),armv7 armv8))
+- ifeq ($(OS),Android)
+- CXXFLAGS += -m$(bits)
+- LDFLAGS += -m$(bits)
+- endif
- else
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
- endif
+- endif
+-
+- ifeq ($(arch),$(filter $(arch),armv7))
+- LDFLAGS += -latomic
+- endif
+-
+- ifneq ($(KERNEL),Darwin)
+- LDFLAGS += -Wl,--no-as-needed
+- endif
+ endif
- ifneq ($(KERNEL),Darwin)
+ ifeq ($(COMP),mingw)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 8e0225e0df7..99d3e95e6f5 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,12 +1,13 @@
# Template file for 'stockfish'
pkgname=stockfish
version=12
-revision=1
+revision=2
_net_file=nn-82215d0fd0df.nnue
wrksrc="Stockfish-sf_${version}"
build_wrksrc=src
build_style=gnu-makefile
make_build_target=build
+make_use_env=yes
hostmakedepends="tar"
short_desc="Free UCI chess engine derived from Glaurung"
maintainer="cipr3s <cipr3s@gmx.com>"
@@ -20,14 +21,18 @@ skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
+# We know how to optimize ourselves
+make_build_args="optimize=no "
+
case $XBPS_TARGET_MACHINE in
x86_64*) make_build_args+="ARCH=x86-64" ;;
i686*) make_build_args+="ARCH=x86-32" ;;
- aarch64*) make_build_args+="ARCH=general-64" ;;
+ aarch64*) make_build_args+="ARCH=armv8" ;;
armv[56]*) make_build_args+="ARCH=general-32";;
armv7*) make_build_args+="ARCH=armv7" ;;
ppc64*) make_build_args+="ARCH=ppc-64" ;;
ppc*) make_build_args+="ARCH=ppc-32" ;;
+ *) broken="not supported" ;;
esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: stockfish: use upstream's cxxflags, fix ftbfs
2021-01-14 1:37 [PR PATCH] stockfish: use upstream's cxxflags, fix ftbfs sgn
2021-01-14 1:50 ` [PR PATCH] [Updated] " sgn
2021-01-14 11:54 ` sgn
@ 2021-01-14 11:58 ` sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2021-01-14 11:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
There's a merged pull request on the void-packages repository
stockfish: use upstream's cxxflags, fix ftbfs
https://github.com/void-linux/void-packages/pull/27910
Description:
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-14 11:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-14 1:37 [PR PATCH] stockfish: use upstream's cxxflags, fix ftbfs sgn
2021-01-14 1:50 ` [PR PATCH] [Updated] " sgn
2021-01-14 11:54 ` sgn
2021-01-14 11:58 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).