From f54c6ce1d41123e7e1dc0bb7ab615315cbc0a7e8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: May 26 2020 22:10:27 +0000 Subject: - Fix inline vs static inline exposed by LTO. --- diff --git a/dahdi-tools.spec b/dahdi-tools.spec index 5f0617b..c4e1853 100644 --- a/dahdi-tools.spec +++ b/dahdi-tools.spec @@ -3,7 +3,7 @@ Name: dahdi-tools Version: %{tools_version} -Release: 16%{?dist} +Release: 17%{?dist} Summary: Userspace tools to configure the DAHDI kernel modules License: GPLv2 and LGPLv2 @@ -29,7 +29,7 @@ Patch3: dahdi-tools_fix-legacy-make.patch # Fix for GCC 10 Patch4: https://issues.asterisk.org/jira/secure/attachment/58976/dahdi-tools-3.1.0-fno-common.patch - +Patch5: gcc-lto.patch BuildRequires: gcc BuildRequires: libusb-devel @@ -86,6 +86,8 @@ ln -s dahdi-linux-%{linux_version}/include include # Fix for GCC 10 %patch4 -p1 -b .gcc10 +%patch5 -p1 -b .gcc-lto + # Fix perl directory in Makefile sed -i -r -e 's"perllibdir = /usr/local/share/perl5"perllibdir = %{perl_vendorlib}"' Makefile @@ -220,6 +222,9 @@ install -D -p -m 0644 dahdi.service %{buildroot}%{_unitdir}/dahdi.service %{_libdir}/*.so %changelog +* Tue May 26 2020 Jeff Law - 2.11.1-17 +- Fix inline vs static inline exposed by LTO. + * Mon May 04 2020 Jared K. Smith - 2.11.1-16 - Add patch to fix XPP compilation with GCC 10 - Fix dependency on systemd-udev for EPEL 7 diff --git a/gcc-lto.patch b/gcc-lto.patch new file mode 100644 index 0000000..ffdc7b9 --- /dev/null +++ b/gcc-lto.patch @@ -0,0 +1,13 @@ +diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c +index 86c4dd4..9aa0cbc 100644 +--- a/xpp/echo_loader.c ++++ b/xpp/echo_loader.c +@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams) + return cOCT6100_ERR_OK; + } + +-inline int get_ver(struct astribank *astribank) ++static inline int get_ver(struct astribank *astribank) + { + return spi_send(astribank, 0, 0, 1, 1); + }