diff --git a/urjtag-gcc10.patch b/urjtag-gcc10.patch new file mode 100644 index 0000000..c9046e6 --- /dev/null +++ b/urjtag-gcc10.patch @@ -0,0 +1,25 @@ +From c6a6b7730e61e00fbaa461e07cee456aff0a6d2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Thu, 13 Feb 2020 16:36:44 +0100 +Subject: [PATCH] fix UrjtagError declaration + +--- + urjtag/bindings/python/py_urjtag.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/urjtag/bindings/python/py_urjtag.h b/urjtag/bindings/python/py_urjtag.h +index 38582ebb..16b120d8 100644 +--- a/urjtag/bindings/python/py_urjtag.h ++++ b/urjtag/bindings/python/py_urjtag.h +@@ -35,7 +35,7 @@ struct urj_pyregister + extern PyTypeObject urj_pyregister_Type; + + extern PyObject *urj_py_chkret (int rc); +-PyObject *UrjtagError; ++extern PyObject *UrjtagError; + + extern int urj_pyc_precheck (urj_chain_t *urc, int checks_needed); + #define UPRC_CBL 1 +-- +2.21.1 + diff --git a/urjtag.spec b/urjtag.spec index d40b637..fbef6a7 100644 --- a/urjtag.spec +++ b/urjtag.spec @@ -6,13 +6,14 @@ Name: urjtag Version: 2019.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for communicating over JTAG with flash chips and CPUs License: GPLv2+ URL: http://urjtag.org Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-fixarm.patch +Patch1: %{name}-gcc10.patch %global py3_prefix python3 @@ -55,6 +56,7 @@ Python bindings and examples for %{name}. %prep %setup -q %patch0 -p2 -b .armfix +%patch1 -p2 -b .gcc10 %build %configure --enable-jedec-exp --enable-stapl --enable-bsdl --enable-svf --disable-static --enable-shared @@ -100,6 +102,9 @@ pushd bindings/python/ %doc bindings/python/t_srst.py %changelog +* Thu Feb 13 2020 Dan HorĂ¡k - 2019.12-3 +- fix FTBFS with gcc10 (#1793499) + * Fri Jan 31 2020 Fedora Release Engineering - 2019.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild