From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 12 Nov 2020 19:06:17 +0000 (+0100)
Subject: - added no-common patch (fixes build with -fno-common, gcc 10 default)
X-Git-Tag: auto/th/cdflib-3.7.1-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcdflib.git;a=commitdiff_plain

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

diff --git a/cdflib-no-common.patch b/cdflib-no-common.patch
new file mode 100644
index 0000000..e638f05
--- /dev/null
+++ b/cdflib-no-common.patch
@@ -0,0 +1,40 @@
+--- cdf37_1-dist/src/include/cdfedit.h.orig	2019-01-24 20:17:20.000000000 +0100
++++ cdf37_1-dist/src/include/cdfedit.h	2020-11-12 19:56:15.464712277 +0100
+@@ -260,6 +260,7 @@
+ Logical browseOnly;             /* TRUE if the CDF is being browsed. */
+ Logical compressed;             /* TRUE if the currently open CDF is
+ 				   compressed. */
++Logical ziso8601;
+ #else
+ extern Logical report[3];
+ extern Logical dumpStatistics;
+@@ -269,8 +270,8 @@
+ extern char olhFile[];
+ extern Logical browseOnly;
+ extern Logical compressed;
++extern Logical ziso8601;
+ #endif
+-Logical ziso8601;
+ 
+ /******************************************************************************
+ * Function prototypes.
+--- cdf37_1-dist/src/include/cdfstats.h.orig	2019-01-24 18:58:21.000000000 +0100
++++ cdf37_1-dist/src/include/cdfstats.h	2020-11-12 20:00:34.328044604 +0100
+@@ -102,6 +102,7 @@
+ long fillvalAttrN;
+ long formatAttrN;
+ long majority;
++Logical ziso8601;
+ #else
+ extern Logical updateValids;
+ extern Logical updateScales;
+@@ -116,8 +117,8 @@
+ extern long fillvalAttrN;
+ extern long formatAttrN;
+ extern long majority;
++extern Logical ziso8601;
+ #endif
+-Logical ziso8601;
+ /******************************************************************************
+ * VarStruct.
+ ******************************************************************************/
diff --git a/cdflib.spec b/cdflib.spec
index e73314f..1d7083f 100644
--- a/cdflib.spec
+++ b/cdflib.spec
@@ -10,6 +10,7 @@ Source0:	https://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf37_1/linux/cdf37_
 # Source0-md5:	0f434ffbb7f6ffe39b2bb20c5a940aee
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-soname.patch
+Patch2:		%{name}-no-common.patch
 URL:		https://cdf.gsfc.nasa.gov/cdf_home.html
 BuildRequires:	gcc-fortran >= 6:4.4.2
 BuildRequires:	ncurses-devel
@@ -62,6 +63,7 @@ API Javy do biblioteki CDF.
 %setup -q -n cdf37_1-dist
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # note: included zlib (src/lib/zlib) is modified (at last public symbol names)