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

[Filipe Laíns]

    Date: Friday, February 19, 2021 @ 15:08:49
  Author: ffy00
Revision: 865857

fix missing provides/conflicts in ghdl-gcc (1.0.0-2)

Modified:
  ghdl/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-19 15:08:12 UTC (rev 865856)
+++ PKGBUILD	2021-02-19 15:08:49 UTC (rev 865857)
@@ -5,7 +5,7 @@
 _gcc=10.2.0
 _isl=0.23
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'
@@ -15,9 +15,11 @@
 validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06'  # Jakub Jelinek <jakub at redhat.com>
               '13975A70E63C361C73AE69EF6EEB81F8981C74C7') # richard.guenther at gmail.com
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        'fix-llvm11.patch::https://github.com/ghdl/ghdl/commit/a45cd97fa291b442002d70ac7e0968a24b0815f9.patch'
         "https://ftp.gnu.org/gnu/gcc/gcc-$_gcc/gcc-$_gcc.tar.xz"{,.sig}
         "http://isl.gforge.inria.fr/isl-$_isl.tar.bz2")
 sha512sums=('efaa277132de3caeafedace137b58fa05bfa61567f12480092b1e8f74a4438e40c85c6e21cd0c5d65fbba3d116b65265e3939a8b5df951baf74837c1eca3196f'
+            '5a0a811dbe21f5caa07b9497ce9d5ac13133f9101f7433ac7e6afb56379c7d624c97aaa43043e31ca88157abc57c0d8b3f78f508ef4a9ec620c9adbcf157a47e'
             '42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e'
             'SKIP'
             '05dfbdbbe852e2440b272808b23210374ce4ce46298eeb4c18ca8725db834b0da607338a371e3d07a78585fc7e0de182e75bf09dff11477937228bd97b7b83f7')
@@ -25,6 +27,10 @@
 prepare() {
   cd "$srcdir"
 
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../fix-llvm11.patch
+  cd ..
+
   cp -r $pkgbase-$pkgver ghdl-mcode
   cp -r $pkgbase-$pkgver ghdl-llvm
   cp -r $pkgbase-$pkgver ghdl-gcc
@@ -153,6 +159,8 @@
 
 package_ghdl-gcc() {
   pkgdesc="$pkgdesc (GCC backend)"
+  provides=('ghdl')
+  conflicts=('ghdl')
   options=(!emptydirs)
 
   cd "$srcdir"/gcc-build