diff --git a/coreutils-8.30-sw.patch b/coreutils-8.30-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..c4b046553aa813dc0bd878be191aff9d5bcef8ad --- /dev/null +++ b/coreutils-8.30-sw.patch @@ -0,0 +1,82 @@ +diff -Naur coreutils-8.30.org/configure coreutils-8.30.sw/configure +--- coreutils-8.30.org/configure 2023-05-15 08:53:56.901887073 +0800 ++++ coreutils-8.30.sw/configure 2023-05-15 09:13:14.399674805 +0800 +@@ -7318,6 +7318,13 @@ + # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4 + # and the GCC 4.1.2 manual). + case "$host_cpu" in ++ sw_64*) ++ if test -n "$GCC"; then ++ CPPFLAGS="$CPPFLAGS -mieee" ++ else ++ CPPFLAGS="$CPPFLAGS -ieee" ++ fi ++ ;; + alpha*) + # On Alpha systems, a compiler option provides the behaviour. + # See the ieee(3) manual page, also available at +@@ -15245,6 +15252,9 @@ + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + gl_cv_host_cpu_c_abi=alpha + ;; ++ sw_64* ) ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; + + arm* | aarch64 ) + # Assume arm with EABI. +diff -Naur coreutils-8.30.org/lib/uname.c coreutils-8.30.sw/lib/uname.c +--- coreutils-8.30.org/lib/uname.c 2018-05-14 12:20:31.000000000 +0800 ++++ coreutils-8.30.sw/lib/uname.c 2023-05-15 09:13:54.170076815 +0800 +@@ -222,6 +222,10 @@ + case PROCESSOR_ARCHITECTURE_MIPS: + strcpy (buf->machine, "mips"); + break; ++ case PROCESSOR_ARCHITECTURE_SW_64: ++ case PROCESSOR_ARCHITECTURE_SW_6464: ++ strcpy (buf->machine, "sw_64"); ++ break; + case PROCESSOR_ARCHITECTURE_ALPHA: + case PROCESSOR_ARCHITECTURE_ALPHA64: + strcpy (buf->machine, "alpha"); +diff -Naur coreutils-8.30.org/m4/fpieee.m4 coreutils-8.30.sw/m4/fpieee.m4 +--- coreutils-8.30.org/m4/fpieee.m4 2018-05-14 12:20:31.000000000 +0800 ++++ coreutils-8.30.sw/m4/fpieee.m4 2023-05-15 09:44:13.015168341 +0800 +@@ -30,6 +30,11 @@ + # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4 + # and the GCC 4.1.2 manual). + case "$host_cpu" in ++ sw_64*) ++ if test -n "$GCC"; then ++ CPPFLAGS="$CPPFLAGS -mieee" ++ fi ++ ;; + alpha*) + # On Alpha systems, a compiler option provides the behaviour. + # See the ieee(3) manual page, also available at +diff -Naur coreutils-8.30.org/m4/host-cpu-c-abi.m4 coreutils-8.30.sw/m4/host-cpu-c-abi.m4 +--- coreutils-8.30.org/m4/host-cpu-c-abi.m4 2018-05-14 12:20:31.000000000 +0800 ++++ coreutils-8.30.sw/m4/host-cpu-c-abi.m4 2023-05-15 09:54:45.675461213 +0800 +@@ -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 diff --git a/coreutils.spec b/coreutils.spec index 493fc1f29d75f2cfc144d0518ad6649602bd6921..89857f2b79ad74d99dfd3ed897f1aac320f6e4c3 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,9 @@ +%define anolis_release .0.1 + Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.30 -Release: 12%{?dist} +Release: 12%{anolis_release}%{?dist} License: GPLv3+ Group: System Environment/Base Url: https://www.gnu.org/software/coreutils/ @@ -97,6 +99,8 @@ Patch908: coreutils-getgrouplist.patch #(upstream did some SELinux implementation unlike with RedHat patch) Patch950: coreutils-selinux.patch +Patch960: coreutils-8.30-sw.patch + Conflicts: filesystem < 3 # To avoid clobbering installs Conflicts: coreutils-single @@ -285,7 +289,11 @@ fi %doc ABOUT-NLS NEWS README THANKS TODO %license COPYING + %changelog +* Mon May 15 2023 wxiat - 8.30-12.1 +- add sw patch + * Wed Jul 07 2021 Kamil Dudka - 8.30-12 - df: fix duplicated remote entries due to bind mounts (#1962515)