summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Prost-Boucle2021-05-09 16:23:01 +0200
committerAdrien Prost-Boucle2021-05-09 16:23:01 +0200
commitfcc2a154e0d4076dbfd09b08ef6df9bdc9383a32 (patch)
tree65839808a9edec8498886b5e3d6657524873d6a1
parentaeea5b01580b4e64cd2a1996bef630c6e7a73c7b (diff)
downloadaur-fcc2a154e0d4076dbfd09b08ef6df9bdc9383a32.tar.gz
Do not install ghwdump to avoit conflicts with gtkwave
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD5
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5b05f225a41..e3ed3f53442 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Apr 26 20:47:40 UTC 2021
+# Sun May 9 14:22:20 UTC 2021
pkgbase = ghdl-mcode-git
pkgdesc = VHDL simulator - mcode back-end
- pkgver = 2.0.0dev.r6204.gfcd93aa1
+ pkgver = 2.0.0dev.r6231.g82665d421
pkgrel = 1
url = https://github.com/ghdl/ghdl
arch = x86_64
@@ -16,8 +16,8 @@ pkgbase = ghdl-mcode-git
depends = gcc-ada
optdepends = python-pydecor: for pyGHDL
optdepends = python-pyvhdlmodel: for pyGHDL.dom
- provides = ghdl=2.0.0dev.r6204.gfcd93aa1
- provides = ghdl-git=2.0.0dev.r6204.gfcd93aa1
+ provides = ghdl=2.0.0dev.r6231.g82665d421
+ provides = ghdl-git=2.0.0dev.r6231.g82665d421
conflicts = ghdl
conflicts = ghdl-gcc-git
conflicts = ghdl-llvm-git
diff --git a/PKGBUILD b/PKGBUILD
index 4049e96fd1f..3cdb8c39e8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Adrien Prost-Boucle <adrien.prost-boucle@laposte.net>
pkgname=ghdl-mcode-git
-pkgver=2.0.0dev.r6204.gfcd93aa1
+pkgver=2.0.0dev.r6231.g82665d421
pkgrel=1
arch=('x86_64' 'i686' 'pentium4')
pkgdesc='VHDL simulator - mcode back-end'
@@ -73,4 +73,7 @@ package() {
ln -s "$_gso" "${pkgdir}/usr/lib/libghdl.so"
fi
+ # GTKWave has always installed binary ghwdump, now ghdl does it too
+ # While awaiting for the two projects to agree, don't install ghwdump from here
+ rm -f "${pkgdir}/usr/bin/ghwdump"
}