From e2adba11ae50e3cc21fbb3cf9c0fb2b82573094d Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Sat, 6 Mar 2021 22:30:31 +0100
Subject: pcr: symbiflow: use fixed git revision

Building this toolchain across the 3 supported architectures
takes some time. So it's better to use fixed git revisions to
ensure that all 3 architectures run the same code and not to
have to update the pkgver just to build for another architecture.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 pcr/arachne-pnr-git/PKGBUILD |  5 +++--
 pcr/icestorm-git/PKGBUILD    | 15 ++++++++++++---
 pcr/nextpnr-git/PKGBUILD     |  7 ++++---
 3 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'pcr')

diff --git a/pcr/arachne-pnr-git/PKGBUILD b/pcr/arachne-pnr-git/PKGBUILD
index 228a07e3a..7bf3eca50 100644
--- a/pcr/arachne-pnr-git/PKGBUILD
+++ b/pcr/arachne-pnr-git/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer(AUR): Sebastian Bøe <sebastianbooe@gmail.com>
-# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # parabola changes and rationale:
 # - Added armv7h and i686 architectures support
+# - Modified to use a fixed git revision
 pkgname=arachne-pnr-git
+_commit=c40fb2289952f4f120cc10a5a4c82a6fb88442dc
 pkgrel=1
 pkgver=r328.c40fb22
 pkgdesc=" Place and route tool for FPGAs"
@@ -13,7 +14,7 @@ depends=('icestorm-git')
 makedepends=('git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/cseed/arachne-pnr.git')
+source=("git+https://github.com/cseed/arachne-pnr.git#commit=${_commit}")
 md5sums=('SKIP')
 
 pkgver() {
diff --git a/pcr/icestorm-git/PKGBUILD b/pcr/icestorm-git/PKGBUILD
index 318127631..9d316213e 100644
--- a/pcr/icestorm-git/PKGBUILD
+++ b/pcr/icestorm-git/PKGBUILD
@@ -1,9 +1,18 @@
 # Maintainer (AUR): Sebastian Bøe <sebastianbooe@gmail.com>
-# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # parabola changes and rationale:
 # - Added armv7h and i686 architectures support
+# - Modified to use a fixed git revision
+# TODO: Bugreport about the broken build with
+#       c1d7ef8b529953bb38f575930eca662d714385abx
 pkgname=icestorm-git
-pkgver=r774.7afc64b
+pkgver=20210306
+# c1d7ef8b529953bb38f575930eca662d714385ab broke the build with the following
+# error, so we use the commit right before it:
+# icetime.cc: In function ‘std::string ecnetname_to_vlog(std::string)’:
+# icetime.cc:1313:15: error: ‘invalid_argument’ in namespace ‘std’ does not name a type
+#  1313 |  } catch(std::invalid_argument &e) { // Not numeric and stoi throws exception
+#       |               ^~~~~~~~~~~~~~~~
+_commit=4cdf41c8408c092e69b819bdbad5a39c1e43943b
 pkgrel=1
 pkgdesc="Lattice iCE40 FPGAs Bitstream Documentation (Reverse Engineered)"
 arch=('armv7h' 'i686' 'x86_64')
@@ -13,7 +22,7 @@ depends=('python' 'libftdi-compat')
 makedepends=('git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/cliffordwolf/icestorm.git')
+source=("git+https://github.com/cliffordwolf/icestorm.git#commit=${_commit}")
 md5sums=('SKIP')
 _prefix="/usr"
 
diff --git a/pcr/nextpnr-git/PKGBUILD b/pcr/nextpnr-git/PKGBUILD
index 9c2d93b52..331b91dba 100644
--- a/pcr/nextpnr-git/PKGBUILD
+++ b/pcr/nextpnr-git/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer(AUR): Graham Edgecombe <gpe@grahamedgecombe.com>
-
 # parabola changes and rationale:
 # - Add armv7h support
+# - Modified to use a fixed git revision
 pkgname=nextpnr-git
-pkgver=r2980.f67d474e
+pkgver=r3206.f0e30abf
+_commit=f0e30abf624ebf9984170b4b81e06e15e31ee4de
 pkgrel=1
 pkgdesc='Portable FPGA place and route tool'
 arch=('armv7h' 'i686' 'x86_64')
@@ -14,7 +15,7 @@ makedepends=('boost' 'cmake' 'eigen' 'git' 'icestorm' 'prjtrellis'
              'prjtrellis-db')
 provides=('nextpnr')
 conflicts=('nextpnr')
-source=('nextpnr::git+https://github.com/YosysHQ/nextpnr.git')
+source=("nextpnr::git+https://github.com/YosysHQ/nextpnr.git#commit=${_commit}")
 sha256sums=('SKIP')
 
 pkgver() {
-- 
cgit v1.2.3