!29 [sync] PR-28: 修复申威架构编译失败
From: @openeuler-sync-bot Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot
Gitee
commit
091957ec5a
102
gawk-5.1.1-sw.patch
Normal file
102
gawk-5.1.1-sw.patch
Normal file
@ -0,0 +1,102 @@
|
||||
diff --git a/configure b/configure
|
||||
index fcef4bd..97affb4 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -8122,7 +8122,7 @@ else $as_nop
|
||||
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 ;;
|
||||
@@ -8151,7 +8151,7 @@ else $as_nop
|
||||
;;
|
||||
|
||||
# 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 --git a/extension/configure b/extension/configure
|
||||
index d8cf11d..1b424bd 100755
|
||||
--- a/extension/configure
|
||||
+++ b/extension/configure
|
||||
@@ -5705,7 +5705,7 @@ else $as_nop
|
||||
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 ;;
|
||||
@@ -5734,7 +5734,7 @@ else $as_nop
|
||||
;;
|
||||
|
||||
# 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 --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
|
||||
index 6db2aa2..2244bc4 100644
|
||||
--- a/m4/host-cpu-c-abi.m4
|
||||
+++ b/m4/host-cpu-c-abi.m4
|
||||
@@ -90,6 +90,12 @@ changequote([,])dnl
|
||||
[gl_cv_host_cpu_c_abi=i386])
|
||||
;;
|
||||
|
||||
+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
|
||||
@@ -355,6 +361,9 @@ EOF
|
||||
#ifndef __x86_64__
|
||||
#undef __x86_64__
|
||||
#endif
|
||||
+#ifndef __sw_64__
|
||||
+#undef __sw_64__
|
||||
+#endif
|
||||
#ifndef __alpha__
|
||||
#undef __alpha__
|
||||
#endif
|
||||
@@ -468,7 +477,7 @@ AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
|
||||
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 @@ AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
|
||||
|
||||
# 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/m4/intdiv0.m4 b/m4/intdiv0.m4
|
||||
index 44f9863..b4d17bb 100644
|
||||
--- a/m4/intdiv0.m4
|
||||
+++ b/m4/intdiv0.m4
|
||||
@@ -69,7 +69,7 @@ int main ()
|
||||
# Guess based on the CPU.
|
||||
changequote(,)dnl
|
||||
case "$host_cpu" in
|
||||
- alpha* | i[34567]86 | x86_64 | m68k | s390*)
|
||||
+ sw_64* | alpha* | i[34567]86 | x86_64 | m68k | s390*)
|
||||
gt_cv_int_divbyzero_sigfpe="guessing yes";;
|
||||
*)
|
||||
gt_cv_int_divbyzero_sigfpe="guessing no";;
|
||||
13
gawk.spec
13
gawk.spec
@ -4,7 +4,7 @@
|
||||
egrep -i "gawk_api_minor.*[0-9]+" | egrep -o "[0-9]")
|
||||
Name: gawk
|
||||
Version: 5.1.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
License: GPLv3+ and GPLv2+ and LGPLv2+ and BSD
|
||||
Summary: The GNU version of the AWK text processing utility
|
||||
URL: https://www.gnu.org/software/gawk/
|
||||
@ -13,6 +13,7 @@ Source0: https://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
|
||||
Patch1: Disable-racy-test-in-test-iolint.awk.patch
|
||||
Patch2: Restore-removed-test-in-test-iolint.awk.patch
|
||||
Patch3: Reorder-statements-in-iolint-to-try-to-eliminate-a-r.patch
|
||||
Patch4: gawk-5.1.1-sw.patch
|
||||
|
||||
BuildRequires: git gcc automake grep
|
||||
BuildRequires: bison texinfo texinfo-tex ghostscript texlive-ec texlive-cm-super glibc-all-langpacks
|
||||
@ -57,10 +58,13 @@ This subpackage provides with language releated files and locales for gawk.
|
||||
autoreconf -fv
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
%ifnarch sw_64
|
||||
%make_build -C doc pdf
|
||||
mkdir -p html/gawk html/gawkinet
|
||||
makeinfo --html -I doc -o html/gawk doc/gawk.texi
|
||||
makeinfo --html -I doc -o html/gawkinet doc/gawkinet.texi
|
||||
%endif
|
||||
|
||||
%check
|
||||
make check
|
||||
@ -76,12 +80,14 @@ ln -sf gawk.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/awk.1.gz
|
||||
ln -sf /usr/share/awk ${RPM_BUILD_ROOT}%{_datadir}/gawk
|
||||
ln -sf /usr/libexec/awk ${RPM_BUILD_ROOT}%{_libexecdir}/gawk
|
||||
|
||||
%ifnarch sw_64
|
||||
install -m 0755 -d ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/gawk/
|
||||
install -m 0755 -d ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/gawkinet/
|
||||
install -m 0644 -p html/gawk/* ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/gawk/
|
||||
install -m 0644 -p html/gawkinet/* ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/gawkinet/
|
||||
install -m 0644 -p doc/gawk.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
|
||||
install -m 0644 -p doc/gawkinet.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc NEWS README POSIX.STD
|
||||
@ -97,9 +103,11 @@ install -m 0644 -p doc/gawkinet.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
|
||||
|
||||
%files help
|
||||
%doc NEWS POSIX.STD README_d/README.multibyte
|
||||
%ifnarch sw_64
|
||||
%doc %{_docdir}/%{name}/gawk.{pdf,ps}
|
||||
%doc %{_docdir}/%{name}/gawkinet.{pdf,ps}
|
||||
%doc %{_docdir}/%{name}/html
|
||||
%endif
|
||||
%{_mandir}/man{1/*,3/*}
|
||||
%{_infodir}/*awk*.info*
|
||||
|
||||
@ -107,6 +115,9 @@ install -m 0644 -p doc/gawkinet.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
|
||||
%{_datadir}/locale/*
|
||||
|
||||
%changelog
|
||||
* Sun Apr 23 2023 guoqinglan <guoqinglan@kylinos.com.cn> - 5.1.1-4
|
||||
- fix sw_64 build
|
||||
|
||||
* Fri Sep 2 2022 zoulin <zoulin13@h-partners.com> - 5.1.1-3
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user