From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] stockfish: use upstream's cxxflags, fix ftbfs
Date: Thu, 14 Jan 2021 12:54:14 +0100 [thread overview]
Message-ID: <20210114115414.mIcta9bWSamz4VLWufAFdHeH_mo6wrjQzC9CNwAcqdg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27910@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-01-14 11:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 1:37 [PR PATCH] " sgn
2021-01-14 1:50 ` [PR PATCH] [Updated] " sgn
2021-01-14 11:54 ` sgn [this message]
2021-01-14 11:58 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210114115414.mIcta9bWSamz4VLWufAFdHeH_mo6wrjQzC9CNwAcqdg@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).