1From ab981e1a973e83edb6ea19e6e84102f43ded0dcb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Aug 2020 11:22:40 -0700
4Subject: [PATCH 2/2] Do not include lib/md5.c into src/shar.c
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9ib/md5.o is part of libgnu.a that is linked to shar. There is no
10point in linking md5.o twice into shar executable. Moreover SuSE
11reports that this triggers a linking error with GCC 10:
12
13/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld:
14../lib/libgnu.a(md5.o): in function `md5_stream':
15[   30s] md5.c:(.text+0x15d): multiple definition of `md5_stream';
16shar.o:shar.c:(.text+0x28): first defined here
17
18<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html>
19
20Signed-off-by: Petr Písař <address@hidden>
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23Upstream-Status: Pending
24
25 src/shar.c | 1 -
26 1 file changed, 1 deletion(-)
27
28diff --git a/src/shar.c b/src/shar.c
29index 11cbada..6d7ed1d 100644
30--- a/src/shar.c
31+++ b/src/shar.c
32@@ -53,7 +53,6 @@ static const char cright_years_z[] =
33
34 #include "inttostr.h"
35 #include "liballoca.h"
36-#include "md5.c"
37 #include "md5.h"
38 #include "quotearg.h"
39 #include "xalloc.h"
40--
412.28.0
42
43