diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..f0ae2af --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,12 @@ +diff -Nrup a/libcomps/src/comps_objmradix.c b/libcomps/src/comps_objmradix.c +--- a/libcomps/src/comps_objmradix.c 2019-11-25 04:21:01.000000000 -0700 ++++ b/libcomps/src/comps_objmradix.c 2019-12-02 11:08:54.738477530 -0700 +@@ -605,7 +605,7 @@ inline void comps_objmrtree_pair_destroy + free(pair); + } + +-inline COMPS_HSList* __comps_objmrtree_all(COMPS_ObjMRTree * rt, char keyvalpair) { ++static inline COMPS_HSList* __comps_objmrtree_all(COMPS_ObjMRTree * rt, char keyvalpair) { + COMPS_HSList *to_process, *ret; + COMPS_HSListItem *hsit, *oldit; + size_t x; diff --git a/libcomps.spec b/libcomps.spec index 181e82f..f8968cc 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -14,12 +14,13 @@ Name: libcomps Version: 0.1.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Comps XML file manipulation library License: GPLv2+ URL: https://github.com/rpm-software-management/libcomps Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +Patch0: gcc10.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -192,6 +193,9 @@ popd %endif %changelog +* Sat Dec 14 2019 Jeff Law - 0.1.14-2 +- Fix inline vs static inline issue for gcc-10 + * Fri Nov 29 2019 Ales Matej - 0.1.14-1 - Update to 0.1.14