From 4f7f98e1fcfadd4814c55ea23fae044b45b2588e Mon Sep 17 00:00:00 2001 From: "zhixin.zhang" Date: Fri, 16 Dec 2022 14:14:09 +0800 Subject: [PATCH] Add sw64 arch patch --- libidn-1.38-sw.patch | 94 ++++++++++++++++++++++++++++++++++++++++++++ libidn.spec | 6 ++- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 libidn-1.38-sw.patch diff --git a/libidn-1.38-sw.patch b/libidn-1.38-sw.patch new file mode 100644 index 0000000..b17b10d --- /dev/null +++ b/libidn-1.38-sw.patch @@ -0,0 +1,94 @@ +diff -Naur libidn-1.38.org/build-aux/config.guess libidn-1.38.sw/build-aux/config.guess +--- libidn-1.38.org/build-aux/config.guess 2022-03-02 01:17:49.120000000 +0000 ++++ libidn-1.38.sw/build-aux/config.guess 2022-03-02 01:24:36.030000000 +0000 +@@ -973,6 +973,14 @@ + UNAME_MACHINE=aarch64_be + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ GUESS=$UNAME_MACHINE-sunway-linux-$LIBC ++ ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff -Naur libidn-1.38.org/build-aux/config.sub libidn-1.38.sw/build-aux/config.sub +--- libidn-1.38.org/build-aux/config.sub 2022-03-02 01:17:49.120000000 +0000 ++++ libidn-1.38.sw/build-aux/config.sub 2022-03-02 01:24:01.940000000 +0000 +@@ -1169,6 +1169,7 @@ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ ++ | sw_64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ +diff -Naur libidn-1.38.org/configure libidn-1.38.sw/configure +--- libidn-1.38.org/configure 2022-03-02 01:17:48.960000000 +0000 ++++ libidn-1.38.sw/configure 2022-03-02 01:25:42.930000000 +0000 +@@ -15719,7 +15719,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 ;; +@@ -15748,7 +15748,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 libidn-1.38.org/lib/gl/m4/host-cpu-c-abi.m4 libidn-1.38.sw/lib/gl/m4/host-cpu-c-abi.m4 +--- libidn-1.38.org/lib/gl/m4/host-cpu-c-abi.m4 2022-03-02 01:17:49.010000000 +0000 ++++ libidn-1.38.sw/lib/gl/m4/host-cpu-c-abi.m4 2022-03-02 01:23:17.370000000 +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/libidn.spec b/libidn.spec index 8a8fbf6..8703787 100644 --- a/libidn.spec +++ b/libidn.spec @@ -4,7 +4,7 @@ Name: libidn Version: 1.38 -Release: 4 +Release: 5 Summary: GNU IDN Library - Libidn License: LGPLv2+ and GPLv3+ and GFDL URL: http://www.gnu.org/software/libidn/ @@ -12,6 +12,7 @@ Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-emacsopt.patch +Patch1: libidn-1.38-sw.patch BuildRequires: autoconf autoconf-archive automake libtool texinfo BuildRequires: gcc gettext gettext-devel pkgconfig help2man @@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %{_infodir}/%{name}.info.gz %changelog +* Fri Dec 16 2022 zhangzhixin - 1.38-5 +- Add sw64 arch patch + * Thu Oct 27 2022 dongyuzhen - 1.38-4 - Rebuild for next release -- Gitee