[arch-commits] Commit in prjtrellis/trunk (PKGBUILD)

[Filipe Laíns]

    Date: Sunday, November 7, 2021 @ 19:52:51
  Author: ffy00
Revision: 1038688

upgpkg: prjtrellis 1.1-1

Modified:
  prjtrellis/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-07 19:52:25 UTC (rev 1038687)
+++ PKGBUILD	2021-11-07 19:52:51 UTC (rev 1038688)
@@ -2,8 +2,8 @@
 
 _prj=trellis
 pkgname=prj$_prj
-pkgver=1.0
-pkgrel=5
+pkgver=1.1
+pkgrel=1
 pkgdesc='Documentation and definitions for the Lattice ECP5 bit-stream format'
 arch=('x86_64')
 url='https://github.com/YosysHQ/prjtrellis'
@@ -13,16 +13,12 @@
 optdepends=('python: Python support')
 provides=('libtrellis')
 conflicts=('libtrellis')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
-        "fix-undefined-runtime_error.patch::$url/commit/d323f5f3834d23a7d070ccc64baf7ead527b9eba.patch")
-sha512sums=('9418cd8b20e0121ca8fce3978b25209df5211b13692db9f86c08c01fc28e40b15dce5c1aed73e09f5e4d9b038259a2a4a8d346bc689d9f6f20782be170728b84'
-            '6043610695cd18891bbce9215ff301e3c05f4a7f4427c931cda32352012deb4ef57c1f24196f500b7e73a18b41210d6fb20fbe8f49b09993c9b4b617e7cd1b7d')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+sha512sums=('9f53e3eb605deadd635a957e4bdde6ade9f24c0b966b2f9ae62a01f8240508b623c30bf452ac276caffffc46edb00180b866f4bbc3ad58151d6b3c0263ab8f0d')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  patch -p1 -i ../fix-undefined-runtime_error.patch
-
   sed -i 's|set(LIBDIR "lib64")|set(LIBDIR "lib")|
           s|project(libtrellis)|project(libtrellis VERSION 1.0)|' libtrellis/CMakeLists.txt
 }
@@ -59,6 +55,8 @@
 
   make DESTDIR="$pkgdir" install
 
+  mv "$pkgdir"/lib "$pkgdir"/usr/lib
+
   # The database is provided in a separate package
   rmdir "$pkgdir"/usr/share/$_prj/database
 }