summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Prost-Boucle2019-07-03 00:25:45 +0200
committerAdrien Prost-Boucle2019-07-03 00:25:45 +0200
commit2181853ec8d714f08c01a66258e6f7d93d08b676 (patch)
tree712a26167c68cd7ff1ac27339ad481960371c0da
parent73423097e0476786ef8900a09eb2fb0598a37ced (diff)
downloadaur-2181853ec8d714f08c01a66258e6f7d93d08b676.tar.gz
Updates
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89615198d3fa..f68ffa332e00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Mar 5 20:03:53 UTC 2019
+# Tue Jul 2 22:25:14 UTC 2019
pkgbase = ghdl-gcc-git
pkgdesc = VHDL simulator - GCC flavour
- pkgver = 0.37dev.git20190303
+ pkgver = 0.37dev.git20190702
pkgrel = 1
url = https://github.com/tgingold/ghdl
install = ghdl.install
diff --git a/PKGBUILD b/PKGBUILD
index 27652c98965a..2e51661585cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# https://aur.archlinux.org/packages/ghdl/
pkgname=ghdl-gcc-git
-pkgver=0.37dev.git20190303
+pkgver=0.37dev.git20190702
pkgrel=1
arch=('any')
pkgdesc='VHDL simulator - GCC flavour'
@@ -34,7 +34,7 @@ pkgver() {
cd "${srcdir}/ghdl"
# GHDL version (extracted from configure)
- _distver=`sed -n -e 's/.*ghdl_version=.*"\(.*\)".*/\1/p' configure | tr -d '-'`
+ _distver=`sed -n -e 's/^ghdl_version=.*"\(.*\)".*/\1/p' configure | tr -d '-'`
# Date of the last git commit
_gitver=`git log -n 1 --date=short | sed -n -e 's/.*Date:\s*\([0-9-]*\).*/\1/p' | tr -d -`
@@ -42,15 +42,18 @@ pkgver() {
}
prepare() {
+ cd "${srcdir}"
+ [[ ! -d gcc ]] && ln -sf gcc-${_gccver/+/-} gcc
+
cd "${srcdir}/ghdl"
./configure \
--prefix=/usr \
- --with-gcc="${srcdir}/gcc-${_gccver}"
+ --with-gcc="${srcdir}/gcc"
make copy-sources
- cd "${srcdir}/gcc-${_gccver}"
+ cd "${srcdir}/gcc"
# Link isl for in-tree build
ln -sf ../isl-${_islver} isl