!320 添加sw架构

From: @wuzx065891 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6
This commit is contained in:
openeuler-ci-bot 2022-11-24 11:14:17 +00:00 committed by Gitee
commit 021a425218
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 50 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From 5c8a08bf2260585ffd0202f3506456e53b74e987 Mon Sep 17 00:00:00 2001
From: wzx <wuzx1226@qq.com>
Date: Thu, 24 Nov 2022 14:10:28 +0800
Subject: [PATCH] Add sw64 architecture
Add sw64 architecture in file runtime/syntax/debcontrol.vim and src/osdef1.h.in to support sw64 architecture.
Signed-off-by: wzx <wuzx1226@qq.com>
---
runtime/syntax/debcontrol.vim | 2 +-
src/osdef1.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 9085cd0..5c945c4 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -28,7 +28,7 @@ syn match debControlSpace "[ \t]"
let s:kernels = ['linux', 'hurd', 'kfreebsd', 'knetbsd', 'kopensolaris', 'netbsd']
let s:archs = [
- \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa'
+ \ 'alpha', 'sw_64', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa'
\, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips'
\, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 'riscv64', 's390x', 's390', 'sh3eb'
\, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32'
diff --git a/src/osdef1.h.in b/src/osdef1.h.in
index 825fe94..f8c3b9d 100644
--- a/src/osdef1.h.in
+++ b/src/osdef1.h.in
@@ -132,7 +132,7 @@ extern char *getcwd(char *, int);
#else
extern char *getwd(char *);
#endif
-#ifndef __alpha /* suggested by Campbell */
+#if !defined __alpha && !defined __sw_64 /* suggested by Campbell */
extern int ioctl(int, int, ...);
#endif
extern int chmod(const char *, mode_t);
--
2.33.0

View File

@ -12,7 +12,7 @@
Name: vim
Epoch: 2
Version: 9.0
Release: 1
Release: 2
Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
License: Vim and MIT
URL: http://www.vim.org
@ -75,6 +75,7 @@ Patch6045: backport-CVE-2022-3324.patch
Patch6046: backport-CVE-2022-3705.patch
Patch9000: bugfix-rm-modify-info-version.patch
Patch9001: vim-Add-sw64-architecture.patch
BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc
BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file
@ -472,6 +473,12 @@ LC_ALL=en_US.UTF-8 make -j1 test
%{_mandir}/man1/evim.*
%changelog
* Thu Nov 10 2022 wuzx<wuzx1226@qq.com> - 2:9.0-2
- Type:feature
- CVE:NA
- SUG:NA
- DESC:Add sw64 architecture
* Thu Nov 03 2022 wangjiang <wangjiang37@h-partners.com> - 2:9.0-1
- Type:enhancement
- ID:NA