From 2a52769ddde74165e482db05c4a9372fdc8621fc Mon Sep 17 00:00:00 2001 From: liheavy <17865196565@163.com> Date: Fri, 30 Jul 2021 14:56:15 +0800 Subject: [PATCH] fix multiple definition tu_debugging_enabled fix multiple definition tu_debugging_enabled --- amanda.spec | 6 +++++- fix-multiple-definition.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 fix-multiple-definition.patch diff --git a/amanda.spec b/amanda.spec index 1c6ec0d..9b002a6 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,7 +9,7 @@ Name: amanda Version: 3.5.1 -Release: 18 +Release: 19 Summary: A backup solution over network to disk License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org @@ -24,6 +24,7 @@ Source15: kamanda.socket Source16: kamanda@.service Patch5: patch-tirpc +Patch6: fix-multiple-definition.patch BuildRequires: automake autoconf libtool dump xfsdump cups BuildRequires: samba-client tar grep gcc-c++ readline-devel libtirpc-devel @@ -193,6 +194,9 @@ make check %{_mandir}/man* %changelog +* Fri Jul 30 2021 Haiwei Li - 3.5.1-19 +- Fix multiple definition tu_debugging_enabled + * Sat Feb 29 2020 Ling Yang - 3.5.1-18 - Fixed build error diff --git a/fix-multiple-definition.patch b/fix-multiple-definition.patch new file mode 100644 index 0000000..c3982ab --- /dev/null +++ b/fix-multiple-definition.patch @@ -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 +