update to newer snapshot; disable lto for f33 rebuild

This commit is contained in:
Gabriel Somlo 2020-08-08 16:30:40 -04:00
parent 4458851af0
commit 08e8e62d93
3 changed files with 18 additions and 8 deletions

2
.gitignore vendored
View File

@ -4,3 +4,5 @@
/prjtrellis-7e97b5b.tar.gz
/prjtrellis-30ee6f2.tar.gz
/prjtrellis-db-717478b.tar.gz
/prjtrellis-db-c137076.tar.gz
/prjtrellis-f93243b.tar.gz

View File

@ -1,2 +1,2 @@
SHA512 (prjtrellis-30ee6f2.tar.gz) = 1cae274a4c4601cbb9c15c4727e420b1622f735a8fa8cb5ce2e2cf0ab6d806760c25d1e1ebe01ed688aae3e61380fb653701cc9cf5aa1afa718164d47396934d
SHA512 (prjtrellis-db-717478b.tar.gz) = ea61bb38ca3e9495b740025020e811d11e09bb03d572b6aed0f09e1e92d886b6c5d7dc109ce0cd300f90c5cb1edb925d19ffd5ed1fe625a12865ed41668ea23a
SHA512 (prjtrellis-db-c137076.tar.gz) = fc63a074acfb6b105b8cd494a331dcb5047a9492f1092017195d40530a1f1fe31efe4fe9c3893f81fdfe916ba2f566e363e0cbe0d4c285d7be86bf96a2937df1
SHA512 (prjtrellis-f93243b.tar.gz) = 49e2c594eea386b9cba1d3003709dd6d2899207bc417cc82782906966c671f9989a7c894ad6bb4b3c6d588479fa76a9e576ed746e71d6708ecb0b56f48e3cf4b

View File

@ -1,16 +1,16 @@
%global commit0 30ee6f2eba8a68f25f4d591819db9b28abbbed94
%global commit0 f93243b000c52b755c70829768d2ae6bcf7bb91a
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global commit1 717478b757a702bbc7e3e11a5fbecee2a64f7922
%global commit1 c137076fdd8bfca3d2bf9cdacda9983dbbec599a
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
%global snapdate 20200127
%global snapdate 20200806
%global __python %{__python3}
Name: trellis
Version: 1.0
Release: 0.11.%{snapdate}git%{shortcommit0}%{?dist}
Release: 0.12.%{snapdate}git%{shortcommit0}%{?dist}
Summary: Lattice ECP5 FPGA bitstream creation/analysis/programming tools
License: ISC
URL: https://github.com/SymbiFlow/prj%{name}
@ -69,8 +69,12 @@ find . -name \*.py -exec sed -i 's|/usr/bin/env python3|/usr/bin/python3|' {} \;
find . -name \.gitignore -delete
%build
# building manpages requires in-source build:
%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}
%make_build
%cmake_build
%make_build -C docs latexpdf
# build manpages:
mkdir man1
@ -84,7 +88,7 @@ do
done
%install
%make_install PREFIX="%{_prefix}"
%cmake_install
install -Dpm644 -t %{buildroot}%{_mandir}/man1 man1/*
%check
@ -112,6 +116,10 @@ install -Dpm644 -t %{buildroot}%{_mandir}/man1 man1/*
%{_datadir}/%{name}/database
%changelog
* Thu Aug 06 2020 Gabriel Somlo <gsomlo@gmail.com> - 1.0-0.12.20200806gitf93243b
- Update to newer snapshot.
- Disable LTO for f33 rebuild (BZ 1865586)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.11.20200127git30ee6f2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild