From 470586eb9132105631ab59effb4be4dc4ee3e2dc Mon Sep 17 00:00:00 2001 From: wzx <471319475@qq.com> Date: Fri, 22 Jul 2022 16:50:37 +0800 Subject: [PATCH 1/2] sw --- tar-1.34-sw.patch | 65 +++++++++++++++++++++++++++++++++++++++++++++++ tar.spec | 4 +++ 2 files changed, 69 insertions(+) create mode 100755 tar-1.34-sw.patch diff --git a/tar-1.34-sw.patch b/tar-1.34-sw.patch new file mode 100755 index 0000000..557af14 --- /dev/null +++ b/tar-1.34-sw.patch @@ -0,0 +1,65 @@ +diff -Naur tar-1.34.org/configure tar-1.34.sw/configure +--- tar-1.34.org/configure 2022-02-14 08:04:01.320000000 +0000 ++++ tar-1.34.sw/configure 2022-02-14 08:16:19.130000000 +0000 +@@ -40564,7 +40564,7 @@ + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; +- x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) ++ x86_64 | sw_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; +@@ -40593,7 +40593,7 @@ + ;; + + # CPUs that only support a 64-bit ABI. +- alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ ++ sw_64* | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + gl_cv_host_cpu_c_abi_32bit=no + ;; +diff -Naur tar-1.34.org/m4/host-cpu-c-abi.m4 tar-1.34.sw/m4/host-cpu-c-abi.m4 +--- tar-1.34.org/m4/host-cpu-c-abi.m4 2022-02-14 08:04:01.200000000 +0000 ++++ tar-1.34.sw/m4/host-cpu-c-abi.m4 2022-02-14 08:17:34.910000000 +0000 +@@ -91,6 +91,12 @@ + ;; + + changequote(,)dnl ++ sw_64* ) ++changequote([,])dnl ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ ++changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha +@@ -355,6 +361,9 @@ + #ifndef __x86_64__ + #undef __x86_64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __alpha__ + #undef __alpha__ + #endif +@@ -468,7 +477,7 @@ + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; +- x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) ++ x86_64 | sw_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; +@@ -498,7 +507,7 @@ + + # CPUs that only support a 64-bit ABI. + changequote(,)dnl +- alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ ++ sw_64* | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + changequote([,])dnl + gl_cv_host_cpu_c_abi_32bit=no diff --git a/tar.spec b/tar.spec index 726cb35..dae4d66 100644 --- a/tar.spec +++ b/tar.spec @@ -7,6 +7,7 @@ License: GPLv3+ URL: http://www.gnu.org/software/tar/ Source0: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz.sig +Patch1: tar-1.34-sw.patch BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycoreutils BuildRequires: gcc @@ -75,6 +76,9 @@ make check %{_infodir}/tar.info* %changelog +* Wed Jul 20 2022 wuzx - 1.34-2 +- add sw64 patch + * Sat Nov 13 2021 shixuantong - 1.34-1 - update version to 1.34 -- Gitee From 924284440baeb96ee5f702e258ed9a115ad3822d Mon Sep 17 00:00:00 2001 From: wzx <471319475@qq.com> Date: Fri, 22 Jul 2022 16:53:15 +0800 Subject: [PATCH 2/2] sw --- tar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tar.spec b/tar.spec index dae4d66..2adf6c2 100644 --- a/tar.spec +++ b/tar.spec @@ -7,7 +7,6 @@ License: GPLv3+ URL: http://www.gnu.org/software/tar/ Source0: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz.sig -Patch1: tar-1.34-sw.patch BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycoreutils BuildRequires: gcc @@ -18,6 +17,7 @@ Patch0002: tar-1.28-vfatTruncate.patch Patch0003: tar-1.29-wildcards.patch Patch0004: tar-1.28-atime-rofs.patch Patch0005: tar-1.28-document-exclude-mistakes.patch +Patch0006: tar-1.34-sw.patch %description GNU Tar provides the ability to create tar archives, as well as various other -- Gitee