stockfish: use upstream's cxxflags, fix ftbfs

This commit is contained in:
Đoàn Trần Công Danh 2021-01-14 08:35:01 +07:00
parent 7eafcbec9d
commit 86d9b50061
2 changed files with 32 additions and 10 deletions

View file

@ -1,12 +1,29 @@
--- src/Makefile.orig --- src/Makefile.orig 2020-09-02 21:19:30.000000000 +0700
+++ src/Makefile +++ src/Makefile 2021-01-14 18:51:25.852600109 +0700
@@ -159,9 +159,6 @@ @@ -306,26 +306,7 @@
CXXFLAGS += -m$(bits)
LDFLAGS += -m$(bits) ifeq ($(COMP),gcc)
endif 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 - else
- CXXFLAGS += -m$(bits) - CXXFLAGS += -m$(bits)
- LDFLAGS += -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)

View file

@ -1,12 +1,13 @@
# Template file for 'stockfish' # Template file for 'stockfish'
pkgname=stockfish pkgname=stockfish
version=12 version=12
revision=1 revision=2
_net_file=nn-82215d0fd0df.nnue _net_file=nn-82215d0fd0df.nnue
wrksrc="Stockfish-sf_${version}" wrksrc="Stockfish-sf_${version}"
build_wrksrc=src build_wrksrc=src
build_style=gnu-makefile build_style=gnu-makefile
make_build_target=build make_build_target=build
make_use_env=yes
hostmakedepends="tar" hostmakedepends="tar"
short_desc="Free UCI chess engine derived from Glaurung" short_desc="Free UCI chess engine derived from Glaurung"
maintainer="cipr3s <cipr3s@gmx.com>" maintainer="cipr3s <cipr3s@gmx.com>"
@ -20,14 +21,18 @@ skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152" LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
# We know how to optimize ourselves
make_build_args="optimize=no "
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
x86_64*) make_build_args+="ARCH=x86-64" ;; x86_64*) make_build_args+="ARCH=x86-64" ;;
i686*) make_build_args+="ARCH=x86-32" ;; 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";; armv[56]*) make_build_args+="ARCH=general-32";;
armv7*) make_build_args+="ARCH=armv7" ;; armv7*) make_build_args+="ARCH=armv7" ;;
ppc64*) make_build_args+="ARCH=ppc-64" ;; ppc64*) make_build_args+="ARCH=ppc-64" ;;
ppc*) make_build_args+="ARCH=ppc-32" ;; ppc*) make_build_args+="ARCH=ppc-32" ;;
*) broken="not supported" ;;
esac esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then