Date: Sunday, April 12, 2020 @ 15:29:06 Author: ffy00 Revision: 613423
upgpkg: ghdl 0.37-4 (install ghdllib in ghdl-gcc) Modified: ghdl/trunk/PKGBUILD ----------+ PKGBUILD | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-12 15:08:45 UTC (rev 613422) +++ PKGBUILD 2020-04-12 15:29:06 UTC (rev 613423) @@ -5,7 +5,7 @@ _gcc=9.3.0 _isl=0.22 pkgver=0.37 -pkgrel=2 +pkgrel=4 pkgdesc='VHDL simulator' arch=('x86_64') url='https://github.com/ghdl/ghdl' @@ -25,6 +25,8 @@ 'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668' '67aff7e7bdcf4b517074a3f436ee2b1fc9b4b1d9d618fe6df0b7819cb44471d051682b1c78e95ce67616563e0714a6297c9936af79d784d49778a8a9cbdad36b') +export GNATMAKE="gnatmake $MAKEFLAGS" + prepare() { cd $pkgbase-$pkgver @@ -98,6 +100,7 @@ --libexecdir=/usr/lib \ --enable-languages=vhdl \ --enable-default-pie \ + --enable-default-ssp \ --with-system-zlib \ --with-isl \ --disable-bootstrap \ @@ -111,9 +114,12 @@ make -# cd "$srcdir"/ghdl-gcc -# -# make ghdllib + cd "$srcdir"/ghdl-gcc + + make \ + GHDL_GCC_BIN="$srcdir"/gcc-build/gcc/ghdl \ + GHDL1_GCC_BIN="--GHDL1=$srcdir/gcc-build/gcc/ghdl1" \ + ghdllib } package_ghdl-mcode() { @@ -140,10 +146,6 @@ pkgdesc="$pkgdesc (GCC backend)" options=(!emptydirs) -# cd "$srcdir"/ghdl-gcc -# -# make DESTDIR="$pkgdir" install - cd "$srcdir"/gcc-build mkdir "$srcdir"/dest @@ -158,5 +160,10 @@ # strip binaries find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc -type f -and \( -executable \) -exec strip '{}' \; + + cd "$srcdir"/ghdl-gcc + + make DESTDIR="$pkgdir" install + }