[packages/rpm] add support for aarch64
atler
atler at pld-linux.org
Sun Apr 26 00:03:06 CEST 2020
commit 58dcd653a27f27228206e5f2ce904841ef54e362
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Apr 26 00:00:57 2020 +0200
add support for aarch64
cpu-os-macros.a | 24 +++++++++++++++++++++++-
rpm.spec | 11 +++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index c06e8f4..f9d228c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1087,6 +1087,10 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
%endif
+%ifnarch aarch64
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/aarch64-linux/macros
+%endif
+
rm $RPM_BUILD_ROOT%{_rpmlibdir}/alpha*-linux/macros
rm $RPM_BUILD_ROOT%{_rpmlibdir}/arm*-linux/macros
rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia64-linux/macros
@@ -1151,6 +1155,10 @@ i386-[^-]*-[Ll]inux(-gnu)?
alpha-[^-]*-[Ll]inux(-gnu)?
%endif
+%ifarch aarch64
+aarch64-[^-]*-[Ll]inux(-gnu)?
+%endif
+
%ifarch ia64
ia64-[^-]*-[Ll]inux(-gnu)?
%endif
@@ -1368,6 +1376,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%ifarch alpha
%{_rpmlibdir}/alpha*
%endif
+%ifarch aarch64
+%{_rpmlibdir}/aarch64*
+%endif
%ifarch ia64
%{_rpmlibdir}/ia64*
%endif
diff --git a/cpu-os-macros.a b/cpu-os-macros.a
index abeed44..716e45a 100644
--- a/cpu-os-macros.a
+++ b/cpu-os-macros.a
@@ -1,5 +1,5 @@
!<arch>
-// 708 `
+// 730 `
alpha-linux.macros/
alphaev5-linux.macros/
alphaev56-linux.macros/
@@ -33,6 +33,7 @@ sparc64-linux.macros/
sparcv9-linux.macros/
x32-linux.macros/
x86_64-linux.macros/
+aarch64-linux.macros/
/0 0 0 0 644 336 `
# Per-platform rpm configuration file.
@@ -684,3 +685,24 @@ k6-linux.macros/0 0 0 644 708 `
%_multilibno 3
%_multilibpatt (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
+/707 1587845877 1000 1000 100644 723 `
+# Per-platform rpm configuration file.
+
+#==============================================================================
+# ---- per-platform macros.
+#
+%_arch aarch64
+%_os linux
+%_gnu -gnu
+%optflags %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -mtune=generic} -march=armv8-a %{!?nospecflags:%{?specflags_aarch64}}
+
+#==============================================================================
+# ---- configure macros.
+#
+%_lib lib64
+
+#---------------------------------------------------------------------
+# Multilibs
+%_multilibno 2
+%_multilibpatt (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/58dcd653a27f27228206e5f2ce904841ef54e362
More information about the pld-cvs-commit
mailing list