fix multiple definition tu_debugging_enabled
fix multiple definition tu_debugging_enabled
This commit is contained in:
parent
e92b986567
commit
2a52769ddd
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Name: amanda
|
Name: amanda
|
||||||
Version: 3.5.1
|
Version: 3.5.1
|
||||||
Release: 18
|
Release: 19
|
||||||
Summary: A backup solution over network to disk
|
Summary: A backup solution over network to disk
|
||||||
License: BSD and GPLv3+ and GPLv2+ and GPLv2
|
License: BSD and GPLv3+ and GPLv2+ and GPLv2
|
||||||
URL: http://www.amanda.org
|
URL: http://www.amanda.org
|
||||||
@ -24,6 +24,7 @@ Source15: kamanda.socket
|
|||||||
Source16: kamanda@.service
|
Source16: kamanda@.service
|
||||||
|
|
||||||
Patch5: patch-tirpc
|
Patch5: patch-tirpc
|
||||||
|
Patch6: fix-multiple-definition.patch
|
||||||
|
|
||||||
BuildRequires: automake autoconf libtool dump xfsdump cups
|
BuildRequires: automake autoconf libtool dump xfsdump cups
|
||||||
BuildRequires: samba-client tar grep gcc-c++ readline-devel libtirpc-devel
|
BuildRequires: samba-client tar grep gcc-c++ readline-devel libtirpc-devel
|
||||||
@ -193,6 +194,9 @@ make check
|
|||||||
%{_mandir}/man*
|
%{_mandir}/man*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 30 2021 Haiwei Li <lihaiwei8@huawei.com> - 3.5.1-19
|
||||||
|
- Fix multiple definition tu_debugging_enabled
|
||||||
|
|
||||||
* Sat Feb 29 2020 Ling Yang <lingyang2@huawei.com> - 3.5.1-18
|
* Sat Feb 29 2020 Ling Yang <lingyang2@huawei.com> - 3.5.1-18
|
||||||
- Fixed build error
|
- Fixed build error
|
||||||
|
|
||||||
|
|||||||
14
fix-multiple-definition.patch
Normal file
14
fix-multiple-definition.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/common-src/testutils.h b/common-src/testutils.h
|
||||||
|
index 31f8973..3bb376f 100644
|
||||||
|
--- a/common-src/testutils.h
|
||||||
|
+++ b/common-src/testutils.h
|
||||||
|
@@ -75,7 +75,7 @@ typedef struct TestUtilsTest {
|
||||||
|
#define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); }
|
||||||
|
|
||||||
|
/* Is debugging enabled for this test run? (set internally) */
|
||||||
|
-int tu_debugging_enabled;
|
||||||
|
+extern int tu_debugging_enabled;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main loop
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user