diff --git a/eppic-use-extern-in-devel-declaration.patch b/eppic-use-extern-in-devel-declaration.patch new file mode 100644 index 0000000..da10c6f --- /dev/null +++ b/eppic-use-extern-in-devel-declaration.patch @@ -0,0 +1,13 @@ +Index: b/libeppic/eppic.h +=================================================================== +--- a/libeppic/eppic.h ++++ b/libeppic/eppic.h +@@ -467,7 +467,7 @@ type_t *eppic_addstorage(type_t *t1, ty + type_t *eppic_getvoidstruct(int ctype); + + extern int lineno, needvar, instruct, nomacs, eppic_legacy; +-node_t *lastv; ++extern node_t *lastv; + + #define NULLNODE ((node_t*)0) + diff --git a/eppic.changes b/eppic.changes index 9e99843..27e65dc 100644 --- a/eppic.changes +++ b/eppic.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 9 13:58:20 UTC 2020 - David Mair + +- eppic-use-extern-in-devel-declaration.patch: Use extern for + declaration of lastv in libeppic/eppic.h. The file is used as the + devel eppic.h and if used in multiple sources for the same devel + link target and using gcc 10 the default behavior is to treat the + mutiple declarations as a link error. + ------------------------------------------------------------------- Fri Aug 2 06:59:17 UTC 2019 - Martin Liška diff --git a/eppic.spec b/eppic.spec index 6bcdeed..af17c28 100644 --- a/eppic.spec +++ b/eppic.spec @@ -1,7 +1,7 @@ # # spec file for package eppic # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,10 +29,11 @@ Group: Development/Libraries/C and C++ Source: %{name}-git%{git_commit}.tar.bz2 Patch1: %{name}-fix-install.patch Patch2: %{name}-no-return.patch +Patch3: %{name}-use-extern-in-devel-declaration.patch BuildRequires: bison BuildRequires: flex BuildRequires: ncurses-devel -Url: http://code.google.com/p/eppic/ +URL: http://code.google.com/p/eppic/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +60,7 @@ This package provides the include files and libraries needed for development. %setup -n %{name}-git%{git_commit} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects