From 64b661afeedaa9a401b7094a8b7ba3855a1ef673 Mon Sep 17 00:00:00 2001 From: wxiat Date: Fri, 30 Jun 2023 16:33:11 +0800 Subject: [PATCH] cherry-pick `add sw arch #1375177cb4e91cd43017a6fdec6ff3caaedb787d`. Signed-off-by: wxiat Signed-off-by: Weisson --- gzip-1.9-sw.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++ gzip.spec | 11 +++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gzip-1.9-sw.patch diff --git a/gzip-1.9-sw.patch b/gzip-1.9-sw.patch new file mode 100644 index 0000000..0e8e9ff --- /dev/null +++ b/gzip-1.9-sw.patch @@ -0,0 +1,53 @@ +diff -Naur gzip-1.9.org/configure gzip-1.9.sw/configure +--- gzip-1.9.org/configure 2023-06-30 16:22:41.244387678 +0800 ++++ gzip-1.9.sw/configure 2023-06-30 16:25:12.059698450 +0800 +@@ -6979,6 +6979,12 @@ + CPPFLAGS="$CPPFLAGS -mieee" + fi + ;; ++ sw_64*) ++ if test -n "$GCC"; then ++ # GCC has the option -mieee. ++ CPPFLAGS="$CPPFLAGS -mieee" ++ fi ++ ;; + esac + + # Check whether --enable-largefile was given. +@@ -14064,6 +14070,10 @@ + gl_cv_host_cpu_c_abi=alpha + ;; + ++ sw_64 ) ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of +diff -Naur gzip-1.9.org/m4/host-cpu-c-abi.m4 gzip-1.9.sw/m4/host-cpu-c-abi.m4 +--- gzip-1.9.org/m4/host-cpu-c-abi.m4 2023-06-30 16:22:41.230387185 +0800 ++++ gzip-1.9.sw/m4/host-cpu-c-abi.m4 2023-06-30 16:23:59.184132228 +0800 +@@ -96,6 +96,12 @@ + gl_cv_host_cpu_c_abi=alpha + ;; + ++changequote(,)dnl ++ sw_64 ) ++changequote([,])dnl ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of +@@ -301,6 +307,9 @@ + #ifndef __x86_64__ + #undef __x86_64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __alpha__ + #undef __alpha__ + #endif diff --git a/gzip.spec b/gzip.spec index c957244..df70733 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 14%{?dist} +Release: 14%{?anolis_release}%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -28,6 +29,9 @@ Patch9: cve-2022-1271-part1.patch Patch10: cve-2022-1271-part2.patch Patch11: cve-2022-1271-part3.patch + +Patch1000: gzip-1.9-sw.patch + # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 URL: http://www.gzip.org/ @@ -65,6 +69,8 @@ very commonly used data compression program. %patch9 -p1 %patch10 -p1 %patch11 -p1 + +%patch1000 -p1 cp %{SOURCE1} . autoreconf @@ -126,6 +132,9 @@ fi %{profiledir}/* %changelog +* Wed Mar 20 2024 wxiat - 1.9-14.0.1 +- cherry-pick `add sw arch #1375177cb4e91cd43017a6fdec6ff3caaedb787d` + * Thu Mar 14 2024 Bo Ren - 1.9-14 - Rebuild -- Gitee