[packages/fzf] do not rely on uname -m to determine target arch; add more arm variants

atler atler at pld-linux.org
Mon Dec 21 23:34:21 CET 2020


commit fe56ff9e1f2dfb7cae768c14c4c760bfe2bcb2d4
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Dec 21 23:33:05 2020 +0100

    do not rely on uname -m to determine target arch; add more arm variants

 fzf.spec | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/fzf.spec b/fzf.spec
index 9309460..8a881a2 100644
--- a/fzf.spec
+++ b/fzf.spec
@@ -25,7 +25,7 @@ Source2:	https://github.com/junegunn/fzf.vim/archive/%{fzfvimrev}/fzf.vim-%{fzfv
 URL:		https://github.com/junegunn/fzf
 BuildRequires:	golang >= 1.13
 BuildRequires:	sed >= 4.0
-ExclusiveArch:	%{x8664} armv5l armv6l armv7l armv8l aarch64 ppc64le
+ExclusiveArch:	%{x8664} armv5l armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl armv8l armv8hll armv8hnl armv8hcnl aarch64 ppc64le
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -94,7 +94,25 @@ Documentation for fzf Vim plugin.
 %{__sed} -i -e '1s,.*env perl,#!%{__perl},' fzf.vim/bin/tags.pl
 
 %build
-%{__make} FZF_VERSION=%{version} FZF_REVISION=%{fzfrev} GOFLAGS=-mod=vendor
+%{__make} \
+%ifarch armv5tl armv5tel arm5tejl
+	UNAME_M=armv5l \
+%else
+%ifarch armv6l armv6hl
+	UNAME_M=armv6l \
+%else
+%ifarch armv7l armv7hl armv7hnl
+	UNAME_M=armv6l \
+%else
+%ifarch armv8l armv8hl armv8hnl armv8hcnl
+	UNAME_M=armv8l \
+%else
+	UNAME_M=%{_target_cpu} \
+%endif
+%endif
+%endif
+%endif
+	FZF_VERSION=%{version} FZF_REVISION=%{fzfrev} GOFLAGS=-mod=vendor
 
 %install
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fzf.git/commitdiff/fe56ff9e1f2dfb7cae768c14c4c760bfe2bcb2d4



More information about the pld-cvs-commit mailing list