From f21f4e9169aa8820fb71c8cb77ace89e978b06a4 Mon Sep 17 00:00:00 2001 From: Maxim Burgerhout Date: Fri, 14 Feb 2020 14:05:10 +0100 Subject: [PATCH] Fixing build error Updating to release 5 and including a patch to 'extern' the definitions of usage and optstring in ykpers-args.h to fix a build error on gcc10 --- ykpers-args-extern.patch | 13 +++++++++++++ ykpers.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ykpers-args-extern.patch diff --git a/ykpers-args-extern.patch b/ykpers-args-extern.patch new file mode 100644 index 0000000..975546f --- /dev/null +++ b/ykpers-args-extern.patch @@ -0,0 +1,13 @@ +--- ykpers-args.h 2019-02-19 13:29:54.000000000 +0100 ++++ ykpers-args.h.patch 2020-02-14 13:27:53.624129087 +0100 +@@ -33,8 +33,8 @@ + + #include "ykpers.h" + +-const char *usage; +-const char *optstring; ++extern const char *usage; ++extern const char *optstring; + + int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid, + size_t oathid_len, const char **infname, diff --git a/ykpers.spec b/ykpers.spec index c7c7f16..de6ef9b 100644 --- a/ykpers.spec +++ b/ykpers.spec @@ -1,11 +1,12 @@ Name: ykpers Version: 1.20.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Yubikey personalization program License: BSD URL: http://opensource.yubico.com/yubikey-personalization/ Source0: http://opensource.yubico.com/yubikey-personalization/releases/%{name}-%{version}.tar.gz +Patch0: ykpers-args-extern.patch %ifnarch s390 s390x BuildRequires: libusb1-devel @@ -30,6 +31,7 @@ use ykpers. %prep %setup -q +%patch0 -p0 %build %configure --enable-static=no --disable-rpath \ @@ -73,6 +75,9 @@ make check %exclude %{_libdir}/libykpers-1.la %changelog +* Fri Feb 14 2020 Maxim Burgerhout - 1.20.0-5 +- Fix build error for Fedora 32 / gcc10 + * Fri Jan 31 2020 Fedora Release Engineering - 1.20.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild