!24 [sync] PR-22: 添加sw架构

From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-11-09 07:43:51 +00:00 committed by Gitee
commit 9b7286b0ed
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 1 deletions

11
libpcap-1.10.1-sw.patch Executable file
View File

@ -0,0 +1,11 @@
diff -Nuar libpcap-1.10.1.org/extract.h libpcap-1.10.1.sw/extract.h
--- libpcap-1.10.1.org/extract.h 2022-02-24 22:28:40.950000000 +0000
+++ libpcap-1.10.1.sw/extract.h 2022-02-24 22:29:55.090000000 +0000
@@ -114,6 +114,7 @@
}
#elif PCAP_IS_AT_LEAST_GNUC_VERSION(2,0) && \
(defined(__alpha) || defined(__alpha__) || \
+ defined(__sw_64) || defined(__sw_64__) || \
defined(__mips) || defined(__mips__))
/*
* This is MIPS or Alpha, which don't natively handle unaligned loads,

View File

@ -1,7 +1,7 @@
Name: libpcap Name: libpcap
Epoch: 14 Epoch: 14
Version: 1.10.1 Version: 1.10.1
Release: 2 Release: 3
Summary: A system-independent interface for user-level packet capture Summary: A system-independent interface for user-level packet capture
License: BSD with advertising License: BSD with advertising
URL: http://www.tcpdump.org URL: http://www.tcpdump.org
@ -9,6 +9,7 @@ Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
Patch0: backport-0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch Patch0: backport-0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch
Patch1: backport-pcap-config-mitigate-multilib-conflict.patch Patch1: backport-pcap-config-mitigate-multilib-conflict.patch
Patch2: libpcap-1.10.1-sw.patch
BuildRequires: bison flex gcc git glibc-kernheaders >= 2.2.0 BuildRequires: bison flex gcc git glibc-kernheaders >= 2.2.0
@ -63,6 +64,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%{_mandir}/man* %{_mandir}/man*
%changelog %changelog
* Thu Jul 28 2022 wuzx<wuzx1226@qq.com> - 14:1.10.1-3
- add sw64 patch
* Fri Feb 18 2022 xihaochen <xihaochen@h-partners.com> - 14:1.10.1-2 * Fri Feb 18 2022 xihaochen <xihaochen@h-partners.com> - 14:1.10.1-2
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA