PR#2: Patch to fix FTBFS issue from GCC13 - rpms/nextpnr

Thomas W Rodgers • a year ago

2b6decf

Thomas W Rodgers • a year ago

a971ce1

nextpnr-fix-gcc13-cstdint-include.patch

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ From 825d646196584a99818a408ad6155166a50c4c30 Mon Sep 17 00:00:00 2001`
		`+ From: Thomas W Rodgers <rodgert@twrodgers.com>`
		`+ Date: Sat, 18 Feb 2023 10:26:01 -0800`
		`+ Subject: [PATCH] Include <cstdint> in common/kernel/hashlib.h`
		`+`
		`+ The definitions for uint32_t, uint64_t report as undefined when`
		`+ compiling under GCC13. They were previously found by transitive`
		`+ includes, but this is not guaranteed to work, and GCC13 forced`
		`+ the issue.`
		`+ ---`
		`+ common/kernel/hashlib.h \| 1 +`
		`+ 1 file changed, 1 insertion(+)`
		`+`
		`+ diff --git a/common/kernel/hashlib.h b/common/kernel/hashlib.h`
		`+ index 2f7357e25c..a3fcd4cabc 100644`
		`+ --- a/common/kernel/hashlib.h`
		`+ +++ b/common/kernel/hashlib.h`
		`+ @@ -14,6 +14,7 @@`
		`+`
		`+ #include <algorithm>`
		`+ #include <array>`
		`+ +#include <cstdint>`
		`+ #include <stdexcept>`
		`+ #include <string>`
		`+ #include <vector>`

nextpnr.spec

file modified

+8 -3

		`@@ -5,7 +5,7 @@`

		`Name: nextpnr`
		`Version: 1`
		`- Release: 18.%{snapdate}git%{shortcommit}%{?dist}`
		`+ Release: 19.%{snapdate}git%{shortcommit}%{?dist}`
		`Summary: FPGA place and route tool`

		`License: ISC and BSD and MIT and (MIT or Public Domain)`
		`@@ -31,6 +31,9 @@`
		`BuildRequires: icestorm >= 0-0.27`
		`BuildRequires: trellis-devel >= 1.2.1-14`

		`+ # https://github.com/YosysHQ/nextpnr/pull/1103`
		`+ Patch1: %{name}-fix-gcc13-cstdint-include.patch`
		`+`
		`# License: ISC`
		`Provides: bundled(qtimgui)`

		`@@ -51,12 +54,11 @@`


		`%prep`
		`- %autosetup -n %{name}-%{commit}`
		`+ %autosetup -n %{name}-%{commit} -p1`
		`cp 3rdparty/imgui/LICENSE.txt LICENSE-imgui.txt`
		`cp 3rdparty/qtimgui/LICENSE LICENSE-qtimgui.txt`
		`cp 3rdparty/python-console/LICENSE LICENSE-python-console.txt`

		`-`
		`%build`
		`%cmake -DARCH=all \`
		`-DICEBOX_DATADIR=%{_datadir}/icestorm \`
		`@@ -86,6 +88,9 @@`


		`%changelog`
		`+ * Sat Feb 18 2023 Thomas W Rodgers <rodgert@twrodgers.com> - 1-19.20230215git78dabb7`
		`+ - Patch to fix FTBFS issue from GCC13`
		`+`
		`* Wed Feb 15 2023 Gabriel Somlo <gsomlo@gmail.com> - 1-18.20230215git78dabb7`
		`- Update to newer snapshot`