!5 rpmbuild构建kabi-dw过程出现multiple definition
From: @arick_liu Reviewed-by: @licihua Signed-off-by: @licihua
This commit is contained in:
commit
627226b8d6
11
hping-multiple-definition-of-delaytable.patch
Normal file
11
hping-multiple-definition-of-delaytable.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- ./hping2.h.xiugai 2021-08-03 10:41:08.601438036 +0800
|
||||||
|
+++ ./hping2.h 2021-08-03 10:44:28.575662672 +0800
|
||||||
|
@@ -357,7 +357,7 @@
|
||||||
|
int status;
|
||||||
|
};
|
||||||
|
|
||||||
|
-volatile struct delaytable_element delaytable[TABLESIZE];
|
||||||
|
+extern volatile struct delaytable_element delaytable[TABLESIZE];
|
||||||
|
|
||||||
|
/* protos */
|
||||||
|
void nop(void); /* nop */
|
||||||
@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
Name: hping
|
Name: hping
|
||||||
Version: 20200503
|
Version: 20200503
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: hping is a command-line oriented TCP/IP packet assembler/analyzer
|
Summary: hping is a command-line oriented TCP/IP packet assembler/analyzer
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://www.hping.org/
|
URL: http://www.hping.org/
|
||||||
Source0: %{name}-%{version}.zip
|
Source0: %{name}-%{version}.zip
|
||||||
|
|
||||||
Patch0: hping-fix-netbpf-header.patch
|
Patch0: hping-fix-netbpf-header.patch
|
||||||
|
Patch1: hping-multiple-definition-of-delaytable.patch
|
||||||
|
|
||||||
BuildRequires: gcc tcl-devel libpcap-devel
|
BuildRequires: gcc tcl-devel libpcap-devel
|
||||||
|
|
||||||
@ -18,6 +19,7 @@ hping is a command-line oriented TCP/IP packet assembler/analyzer. The interface
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-master/
|
%setup -q -n %{name}-master/
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
@ -45,6 +47,9 @@ install -m0644 docs/hping3.8 %{buildroot}/%{_mandir}/man8
|
|||||||
%{_mandir}/*
|
%{_mandir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 2 2021 liushaofei <liushaofei5@huawei.com>
|
||||||
|
- fix multiple definition
|
||||||
|
|
||||||
* Mon Oct 12 2020 liqingqing_1229 <liqingqing3@huawei.com>
|
* Mon Oct 12 2020 liqingqing_1229 <liqingqing3@huawei.com>
|
||||||
- update source0's url
|
- update source0's url
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user