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

diff --git a/open-vmdk-extern.patch b/open-vmdk-extern.patch
new file mode 100644 (file)
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,

diff --git a/open-vmdk.spec b/open-vmdk.spec
index ad60f9be51f121a81797f5217fffee3044effae2..69404d3629a9956dc845cbce62fc5ddf96d09e97 100644 (file)
--- 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} \