[packages/dietlibc] always pass MYARCH explicitly

atler atler at pld-linux.org
Sat Nov 14 01:15:24 CET 2020


commit 514b1e9160cde18c56e5343342356f13022bcfc1
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Nov 14 01:10:50 2020 +0100

    always pass MYARCH explicitly
    
    MYARCH defaults to `uname -m` which is host arch while it should
    consider %{_target_cpu} instead. %{libarch} happens to be already
    normalized to values expected by Makefile

 dietlibc.spec | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/dietlibc.spec b/dietlibc.spec
index e8045a7..4c41eb4 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -125,18 +125,14 @@ CC="%{__cc}"
 sparc32 \
 %endif
 %{__make} -j1 all \
-%ifarch x32
-	MYARCH=x32 \
-%endif
+	MYARCH=%{libarch} \
 	prefix=%{dietprefix} \
 	CC="${CC#*ccache }"
 
 %if %{with dynamic}
 # 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
-%ifarch x32
-	MYARCH=x32 \
-%endif
+	MYARCH=%{libarch} \
 	prefix=%{dietprefix} \
 	CC="${CC}"
 %endif
@@ -149,9 +145,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
 sparc32 \
 %endif
 %{__make} install \
-%ifarch x32
-	MYARCH=x32 \
-%endif
+	MYARCH=%{libarch} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	prefix=%{dietprefix}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dietlibc.git/commitdiff/514b1e9160cde18c56e5343342356f13022bcfc1



More information about the pld-cvs-commit mailing list