[packages/open-vmdk] - added extern patch (fixes build with -fno-common, gcc 10+ default)

qboosh qboosh at pld-linux.org
Wed Jan 5 21:02:37 CET 2022


commit 0396ebebcb1b57d7daa166b833f6366f4e63fc74
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 5 21:03:31 2022 +0100

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

 open-vmdk-extern.patch | 22 ++++++++++++++++++++++
 open-vmdk.spec         |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/open-vmdk.spec b/open-vmdk.spec
index ad60f9b..69404d3 100644
--- a/open-vmdk.spec
+++ b/open-vmdk.spec
@@ -9,6 +9,7 @@ License:	Apache v2.0
 Group:		Applications/File
 Source0:	https://github.com/vmware/open-vmdk/archive/%{gitref}/%{name}-%{snap}.tar.gz
 # Source0-md5:	ab2448b64262ccb43a0ec545f18156d2
+Patch0:		%{name}-extern.patch
 URL:		https://github.com/vmware/open-vmdk
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,6 +30,7 @@ oraz pliku manifestu z rozszerzeniem .mf.
 
 %prep
 %setup -q -n %{name}-%{gitref}
+%patch0 -p1
 
 %build
 %{__make} \
diff --git a/open-vmdk-extern.patch b/open-vmdk-extern.patch
new file mode 100644
index 0000000..19077c6
--- /dev/null
+++ b/open-vmdk-extern.patch
@@ -0,0 +1,22 @@
+--- open-vmdk-875f4162c91c7fc7bc450dccaf7b896a927fa42b/vmdk/diskinfo.h.orig	2021-11-04 07:17:03.000000000 +0100
++++ open-vmdk-875f4162c91c7fc7bc450dccaf7b896a927fa42b/vmdk/diskinfo.h	2022-01-05 20:54:21.194950226 +0100
+@@ -35,7 +35,7 @@ struct DiskInfo {
+ 	const DiskInfoVMT *vmt;
+ };
+ 
+-char *toolsVersion; /* toolsVersion in metadata */
++extern char *toolsVersion; /* toolsVersion in metadata */
+ 
+ DiskInfo *Flat_Open(const char *fileName);
+ DiskInfo *Flat_Create(const char *fileName, off_t capacity);
+--- open-vmdk-875f4162c91c7fc7bc450dccaf7b896a927fa42b/vmdk/mkdisk.c.orig	2021-11-04 07:17:03.000000000 +0100
++++ open-vmdk-875f4162c91c7fc7bc450dccaf7b896a927fa42b/vmdk/mkdisk.c	2022-01-05 20:55:53.239767639 +0100
+@@ -24,6 +24,8 @@
+ #include <string.h>
+ #include <getopt.h>
+ 
++char *toolsVersion; /* toolsVersion in metadata */
++
+ static int
+ copyData(DiskInfo *dst,
+          off_t dstOffset,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/open-vmdk.git/commitdiff/0396ebebcb1b57d7daa166b833f6366f4e63fc74



More information about the pld-cvs-commit mailing list