[packages/sheepdog] - added no-common patch (fixes build with -fno-common, gcc 10+ default)

qboosh qboosh at pld-linux.org
Sun Mar 5 21:36:55 CET 2023


commit 25ddb8adb7560b8133c14e2ad4b990bc25ad5059
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 5 21:38:54 2023 +0100

    - added no-common patch (fixes build with -fno-common, gcc 10+ default)

 sheepdog-no-common.patch | 15 +++++++++++++++
 sheepdog.spec            |  3 +++
 2 files changed, 18 insertions(+)
---
diff --git a/sheepdog.spec b/sheepdog.spec
index f56caa0..f4b383b 100644
--- a/sheepdog.spec
+++ b/sheepdog.spec
@@ -19,6 +19,7 @@ Group:		Applications/System
 #Source0Download: https://github.com/sheepdog/sheepdog/tags
 Source0:	https://github.com/collie/sheepdog/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	0f7f865ceefc07a88dfec5c2f1912e32
+Patch0:		%{name}-no-common.patch
 URL:		http://www.osrg.net/sheepdog/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -28,6 +29,7 @@ BuildRequires:	libfuse-devel >= 2.8.0
 BuildRequires:	libqb-devel
 BuildRequires:	libtool >= 2:2
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	userspace-rcu-devel >= 0.6.0
 %ifarch %{x8664}
@@ -104,6 +106,7 @@ Biblioteka statyczna sheepdog.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/sheepdog-no-common.patch b/sheepdog-no-common.patch
new file mode 100644
index 0000000..8020ad4
--- /dev/null
+++ b/sheepdog-no-common.patch
@@ -0,0 +1,15 @@
+--- sheepdog-1.0.1/include/sha1.h.orig	2016-10-21 10:05:40.000000000 +0200
++++ sheepdog-1.0.1/include/sha1.h	2023-03-01 21:03:26.201978845 +0100
+@@ -27,9 +27,9 @@ typedef void (*sha1_init_func_t)(void *)
+ typedef void (*sha1_update_func_t)(void *, const uint8_t *, unsigned int);
+ typedef void (*sha1_final_func_t)(void *, uint8_t *);
+ 
+-sha1_init_func_t sha1_init;
+-sha1_update_func_t sha1_update;
+-sha1_final_func_t sha1_final;
++extern sha1_init_func_t sha1_init;
++extern sha1_update_func_t sha1_update;
++extern sha1_final_func_t sha1_final;
+ 
+ const char *sha1_to_hex(const unsigned char *sha1);
+ void get_buffer_sha1(unsigned char *buf, unsigned len, unsigned char *sha1);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sheepdog.git/commitdiff/25ddb8adb7560b8133c14e2ad4b990bc25ad5059



More information about the pld-cvs-commit mailing list