fix for Python 3.11, BZ 2103635

This commit is contained in:
Gabriel Somlo 2022-07-05 13:30:42 -04:00
parent 091d3bccd4
commit f2c4fb2da0
3 changed files with 12 additions and 5 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@
/prjtrellis-46f50f7.tar.gz
/prjtrellis-64b38df.tar.gz
/prjtrellis-db-35d900a.tar.gz
/prjtrellis-7a2e9ed.tar.gz

View File

@ -1,2 +1,2 @@
SHA512 (prjtrellis-64b38df.tar.gz) = 21fe1fa5ebe954d9997c079944bc3b87a72e247c37ab38c1598920c823daf35cd80efbe12e221bfd2d484d134ebc50f21749e9a1e715b1501b94efa8a12ca57f
SHA512 (prjtrellis-7a2e9ed.tar.gz) = 4c726ad63b3e66da0f7a6eaf8a0be54278aa5076120564a594a7b3c9490c57c11f21a4deb211860a69b2075a20e58377bfd2c479e58ca600c13773a0c71fd6bc
SHA512 (prjtrellis-db-35d900a.tar.gz) = 21e3a6ea386af610fdff4124151ebe98cb0ad75be641b641fa1f52ef0fd521feb289628d156cdcf69e209fdcdb9c65aeb3226128dd652c8ae3fb2cb7f3aa4389

View File

@ -1,16 +1,16 @@
%global commit0 64b38dfda6f0bc556839b513820f943f64b23cc3
%global commit0 7a2e9ed8a7d145251f5720a43229ee77de637d4a
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global commit1 35d900a94ff0db152679a67bf6e4fbf40ebc34aa
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
%global snapdate 20220509
%global snapdate 20220705
%global __python %{__python3}
Name: trellis
Version: 1.2.1
Release: 7.%{snapdate}git%{shortcommit0}%{?dist}
Release: 8.%{snapdate}git%{shortcommit0}%{?dist}
Summary: Lattice ECP5 FPGA bitstream creation/analysis/programming tools
License: ISC
URL: https://github.com/YosysHQ/prj%{name}
@ -22,6 +22,7 @@ BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: python3-devel
BuildRequires: boost-python3-devel
BuildRequires: pybind11-devel
# for building docs:
BuildRequires: python3-sphinx-latex
BuildRequires: python3-recommonmark
@ -71,7 +72,9 @@ find . -name \.gitignore -delete
%define __cmake_in_source_build 1
# disable LTO to allow building for f33 rawhide (BZ 1865586):
%define _lto_cflags %{nil}
%cmake libtrellis -DCURRENT_GIT_VERSION=%{version}-%{release}
%cmake libtrellis \
-DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \
-DCURRENT_GIT_VERSION=%{version}-%{release}
%cmake_build
%make_build -C docs latexpdf
# build manpages:
@ -114,6 +117,9 @@ install -Dpm644 -t %{buildroot}%{_mandir}/man1 man1/*
%{_datadir}/%{name}/database
%changelog
* Tue Jul 05 2022 Gabriel Somlo <gsomlo@gmail.com> - 1.2.1-8.20220705git7a2e9ed
- Update to newer snapshot (incl. fix for Python 3.11, BZ 2103635).
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.2.1-7.20220509git64b38df
- Rebuilt for Python 3.11