Skip to content

Commit b46fcfe

Browse files
committed
disable asm on non-x86_64 to fix exec stack; rel 2
see facebook/zstd#2963
1 parent 62ae61c commit b46fcfe

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

zstd.spec

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
#
2+
# Conditional build:
3+
%bcond_without asm # disable assembler
4+
5+
# workaround executable stack on non-x86_64
6+
# https://github.com/facebook/zstd/issues/2963
7+
%ifnarch %{x8664}
8+
%undefine with_asm
9+
%endif
10+
111
Summary: Zstandard - fast lossless compression algorithm
212
Summary(pl.UTF-8): Zstandard - szybki, bezstratny algorytm kompresji
313
Name: zstd
414
Version: 1.5.1
5-
Release: 1
15+
Release: 2
616
License: BSD
717
Group: Libraries
818
#Source0Download: https://github.com/facebook/zstd/releases
@@ -63,7 +73,8 @@ CFLAGS="%{rpmcflags} %{rpmcppflags} %{?archcflags}" \
6373
CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
6474
LDFLAGS="%{rpmldflags}" \
6575
%{__make} allmost manual \
66-
V=1
76+
V=1 \
77+
%{!?with_asm:ZSTD_NO_ASM=1}
6778

6879
%install
6980
rm -rf $RPM_BUILD_ROOT

0 commit comments

Comments
 (0)