diff options
| author | Adrien Prost-Boucle | 2017-06-20 22:10:31 +0200 |
|---|---|---|
| committer | Adrien Prost-Boucle | 2017-06-20 22:10:31 +0200 |
| commit | f6fdc7b5e1b13d6d8e57af217932bdf8bf7fd15b (patch) | |
| tree | 34d98cba46c4fc2ad5ff5ce982157fd0874817a4 | |
| parent | 1e86cf8a79f64e43ab2480816785afb5451bed7b (diff) | |
| download | aur-f6fdc7b5e1b13d6d8e57af217932bdf8bf7fd15b.tar.gz | |
Update for new GHDL Makefile
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | Makefile.patch | 20 | ||||
| -rw-r--r-- | PKGBUILD | 21 |
4 files changed, 21 insertions, 40 deletions
@@ -1,13 +1,12 @@ # Generated by mksrcinfo v8 -# Sun Nov 27 21:35:46 UTC 2016 +# Tue Jun 20 20:09:46 UTC 2017 pkgbase = ghdl-gcc-git pkgdesc = VHDL simulator - GCC flavour - pkgver = 0.34dev.git20161119 + pkgver = 0.34dev.git20170619 pkgrel = 1 url = http://sourceforge.net/projects/ghdl-updates/ install = ghdl.install - arch = i686 - arch = x86_64 + arch = any license = GPLv2 makedepends = gcc-ada makedepends = git @@ -21,12 +20,10 @@ pkgbase = ghdl-gcc-git source = ftp://ftp.gnu.org/gnu/gcc/gcc-4.9.3/gcc-4.9.3.tar.bz2 source = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.12.2.tar.bz2 source = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-0.18.1.tar.gz - source = Makefile.patch md5sums = SKIP md5sums = 6f831b4d251872736e8e9cc09746f327 md5sums = e039bfcfb6c2ab039b8ee69bf883e824 md5sums = e34fca0540d840e5d0f6427e98c92252 - md5sums = 5b0c20923b9fda2bd7f6caa6391bf125 pkgname = ghdl-gcc-git diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..4371e5a887a4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ + +src +pkg + +*.bz2 +*.gz +*.tar +*.xz + +ghdl + diff --git a/Makefile.patch b/Makefile.patch deleted file mode 100644 index fa3b8bc0d210..000000000000 --- a/Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile -+++ Makefile -@@ -331,7 +331,7 @@ - - ANALYZE_DEP:=ghdl_$(backend)$(EXEEXT) - GHDL=$(PWD)/$(ANALYZE_DEP) --ANALYZE_OPTS:= -+#ANALYZE_OPTS:= - ANALYZE:=$(GHDL) -a $(ANALYZE_OPTS) $(LIB_CFLAGS) - - # TODO?: don't include, make it separate -@@ -341,7 +341,7 @@ - ifeq "$(backend)" "gcc" - # ghdl with gcc backend is already installed, no need to specify ghdl1 - # (and we don't know where it is). -- STD_GHDL_FLAGS= -+ #STD_GHDL_FLAGS= - else - # Specify ghdl1 path, as it is spawned by ghdl. - STD_GHDL_FLAGS=--GHDL1=$(PWD)/ghdl1-$(backend)$(EXEEXT) @@ -3,9 +3,9 @@ # https://aur.archlinux.org/packages/ghdl/ pkgname=ghdl-gcc-git -pkgver=0.34dev.git20161119 +pkgver=0.34dev.git20170619 pkgrel=1 -arch=('i686' 'x86_64') +arch=('any') pkgdesc='VHDL simulator - GCC flavour' url='http://sourceforge.net/projects/ghdl-updates/' license=('GPLv2') @@ -26,14 +26,12 @@ source=( "ftp://ftp.gnu.org/gnu/gcc/gcc-${_gccver}/gcc-${_gccver}.tar.bz2" "ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2" "ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-${_cloogver}.tar.gz" - "Makefile.patch" ) md5sums=( 'SKIP' '6f831b4d251872736e8e9cc09746f327' 'e039bfcfb6c2ab039b8ee69bf883e824' 'e34fca0540d840e5d0f6427e98c92252' - '5b0c20923b9fda2bd7f6caa6391bf125' ) pkgver() { @@ -110,19 +108,14 @@ build() { # Build GHDL make - # Some fixes to enable launching GHDL without installing it cd "${srcdir}/ghdl" - patch -p0 -N -i "${startdir}"/Makefile.patch || true - # Build VHDL libraries + # Build VHDL libraries and runtime, + # with some tweaks to enable running GHDL without installing it make \ - GHDL="${srcdir}/gcc-build/gcc/ghdl" \ - ANALYZE_OPTS="--GHDL1=${srcdir}/gcc-build/gcc/ghdl1" \ - STD_GHDL_FLAGS="--GHDL1=${srcdir}/gcc-build/gcc/ghdl1" \ - vhdl.libs.all libs.vhdl.standard - - # Compile runtime stuff - make libgrt.a + GHDL_GCC_BIN="${srcdir}/gcc-build/gcc/ghdl" \ + GHDL1_GCC_BIN="--GHDL1=${srcdir}/gcc-build/gcc/ghdl1" \ + ghdllib } package() { |