From 3983f395c1706ff22cf49b66cc8a528d04f2f7d3 Mon Sep 17 00:00:00 2001 From: "zhixin.zhang" Date: Thu, 15 Dec 2022 16:16:08 +0800 Subject: [PATCH] Add sw arch patch --- gnulib-68df637-sw.patch | 37 +++++++++++++++++++++++++++++++++++++ gnulib.spec | 7 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnulib-68df637-sw.patch diff --git a/gnulib-68df637-sw.patch b/gnulib-68df637-sw.patch new file mode 100644 index 0000000..4993272 --- /dev/null +++ b/gnulib-68df637-sw.patch @@ -0,0 +1,37 @@ +diff -Naur gnulib-68df637.org/build-aux/config.guess gnulib-68df637.sw/build-aux/config.guess +--- gnulib-68df637.org/build-aux/config.guess 2022-03-28 02:07:23.081103160 +0000 ++++ gnulib-68df637.sw/build-aux/config.guess 2022-03-28 02:07:26.021103160 +0000 +@@ -913,6 +913,14 @@ + UNAME_MACHINE=aarch64_be + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo "$UNAME_MACHINE"-sunway-linux-"$LIBC" ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff -Naur gnulib-68df637.org/build-aux/config.sub gnulib-68df637.sw/build-aux/config.sub +--- gnulib-68df637.org/build-aux/config.sub 2022-03-28 02:07:23.081103160 +0000 ++++ gnulib-68df637.sw/build-aux/config.sub 2022-03-28 02:07:26.021103160 +0000 +@@ -568,6 +568,7 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | sw_64 \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ +@@ -691,6 +692,7 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | sw_64-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ diff --git a/gnulib.spec b/gnulib.spec index 0e0d155..5f740a8 100644 --- a/gnulib.spec +++ b/gnulib.spec @@ -1,11 +1,13 @@ Name: gnulib Version: 0 -Release: 30.20180720git +Release: 31.20180720git Summary: The GNU Portability Library License: Public Domain and BSD and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2 and LGPLv2+ and LGPLv3+ URL: https://www.gnu.org/software/gnulib Source0: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=68df637;sf=tgz;name=gnulib-68df637.tar.gz#/gnulib-68df637.tar.gz Patch0: CVE-2018-17942.patch +Patch1: gnulib-68df637-sw.patch + BuildRequires: perl-generators texinfo java-devel gettext-devel bison gperf libtool help2man git gcc_secure %description @@ -119,6 +121,9 @@ fi %license doc/COPYINGv2 %changelog +* Thu Dec 15 2022 zhangzhixin - 0-31.20180720git +- Add sw arch patch + * Sat Nov 19 2022 huajingyun - 0-30.20180720git - Update config.guess and config.sub for loongarch -- Gitee