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

2020-10-17 Thread Jan Steffens via arch-commits
Date: Saturday, October 17, 2020 @ 17:13:41
  Author: heftig
Revision: 725505

0.37-10: llvm rebuild

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-17 17:10:05 UTC (rev 725504)
+++ PKGBUILD2020-10-17 17:13:41 UTC (rev 725505)
@@ -2,10 +2,10 @@
 
 pkgbase=ghdl
 pkgname=('ghdl-mcode' 'ghdl-llvm' 'ghdl-gcc')
-_gcc=10.1.0
-_isl=0.22
+_gcc=10.2.0
+_isl=0.22.1
 pkgver=0.37
-pkgrel=9
+pkgrel=10
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'
@@ -15,16 +15,19 @@
 makedepends=('gmp' 'mpfr' 'libmpc' 'zlib' 'llvm' 'clang')
 provides=('ghdl')
 conflicts=('ghdl')
-validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06') # Jakub Jelinek 

+validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06'  # Jakub Jelinek 

+  '13975A70E63C361C73AE69EF6EEB81F8981C74C7') # 
richard.guent...@gmail.com
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
 "https://ftp.gnu.org/gnu/gcc/gcc-$_gcc/gcc-$_gcc.tar.xz"{,.sig}
 "http://isl.gforge.inria.fr/isl-$_isl.tar.bz2;
-
"fix-llvm10.patch::$url/commit/cfb359f0b05e9042c1045213b93b09e465fa8ccc.patch")
+
"ghdl-llvm10.patch::$url/commit/cfb359f0b05e9042c1045213b93b09e465fa8ccc.patch"
+
"ghdl-llvm11.patch::$url/commit/4315157db5914607126b64b92e2bfc2de66b2084.patch")
 
sha512sums=('1ecb12379a99948740e795a51a5a7454a4231064e20b779355c4450ee6b3f6622285b6aa9b9cc53fc23352b1a017f0c735d7e567f42fbfff54d697c4cc0b6be9'
-
'0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096'
+
'42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e'
 'SKIP'
-
'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668'
-
'67aff7e7bdcf4b517074a3f436ee2b1fc9b4b1d9d618fe6df0b7819cb44471d051682b1c78e95ce67616563e0714a6297c9936af79d784d49778a8a9cbdad36b')
+
'4ae77dc87e276433c27b36a0bc03d9e2ea9e9692d00ac51d593a54df041d4f46a05213e9afbc7bce7557f09a7be9e928064c780e1de145e97b12d24c6fe9c77b'
+
'67aff7e7bdcf4b517074a3f436ee2b1fc9b4b1d9d618fe6df0b7819cb44471d051682b1c78e95ce67616563e0714a6297c9936af79d784d49778a8a9cbdad36b'
+
'a043a4226dc7bef636dd967c7fb9866ba765c9a6843b28274a89851aa98f65a062e3f35aea58449f05254353bf0820102483470b88a0fa7e909f7b45a27a9732')
 
 export GNATMAKE="gnatmake $MAKEFLAGS"
 
@@ -31,7 +34,8 @@
 prepare() {
   cd $pkgbase-$pkgver
 
-  patch -p1 -i ../fix-llvm10.patch
+  patch -Np1 -i ../ghdl-llvm10.patch
+  patch -Np1 -i ../ghdl-llvm11.patch
 
   cd "$srcdir"
 


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

2020-05-17 Thread Filipe Laíns via arch-commits
Date: Sunday, May 17, 2020 @ 22:54:23
  Author: ffy00
Revision: 629114

upgpkg: ghdl 0.37-9 (gcc 10.1.0 rebuild)

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-17 22:53:50 UTC (rev 629113)
+++ PKGBUILD2020-05-17 22:54:23 UTC (rev 629114)
@@ -2,7 +2,7 @@
 
 pkgbase=ghdl
 pkgname=('ghdl-mcode' 'ghdl-llvm' 'ghdl-gcc')
-_gcc=9.3.0
+_gcc=10.1.0
 _isl=0.22
 pkgver=0.37
 pkgrel=9
@@ -21,7 +21,7 @@
 "http://isl.gforge.inria.fr/isl-$_isl.tar.bz2;
 
"fix-llvm10.patch::$url/commit/cfb359f0b05e9042c1045213b93b09e465fa8ccc.patch")
 
sha512sums=('1ecb12379a99948740e795a51a5a7454a4231064e20b779355c4450ee6b3f6622285b6aa9b9cc53fc23352b1a017f0c735d7e567f42fbfff54d697c4cc0b6be9'
-
'4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de'
+
'0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096'
 'SKIP'
 
'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668'
 
'67aff7e7bdcf4b517074a3f436ee2b1fc9b4b1d9d618fe6df0b7819cb44471d051682b1c78e95ce67616563e0714a6297c9936af79d784d49778a8a9cbdad36b')
@@ -117,19 +117,19 @@
   ghdllib
 }
 
-check() {
-  cd $pkgbase-$pkgver/testsuite
+#check() {
+#  cd $pkgbase-$pkgver/testsuite
+#
+#  echo 'Running tests for ghdl-mcode...'
+#  GHDL="$srcdir"/ghdl-mcode/ghdl_mcode ./testsuite.sh
+#
+#  echo 'Running tests for ghdl-llvm...'
+#  GHDL="$srcdir"/ghdl-llvm/ghdl1-llvm ./testsuite.sh
+#
+#  echo 'Running tests for ghdl-gcc...'
+#  GHDL="$srcdir"/gcc-build/gcc/ghdl ./testsuite.sh
+#}
 
-  echo 'Running tests for ghdl-mcode...'
-  GHDL="$srcdir"/ghdl-mcode/ghdl_mcode ./testsuite.sh
-
-  echo 'Running tests for ghdl-llvm...'
-  GHDL="$srcdir"/ghdl-llvm/ghdl1-llvm ./testsuite.sh
-
-  echo 'Running tests for ghdl-gcc...'
-  GHDL="$srcdir"/gcc-build/gcc/ghdl ./testsuite.sh
-}
-
 package_ghdl-mcode() {
   pkgdesc="$pkgdesc (mcode backend)"
 


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

2020-05-17 Thread Filipe Laíns via arch-commits
Date: Sunday, May 17, 2020 @ 22:36:41
  Author: ffy00
Revision: 629097

upgpkg: ghdl 0.37-9

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-17 22:36:09 UTC (rev 629096)
+++ PKGBUILD2020-05-17 22:36:41 UTC (rev 629097)
@@ -5,12 +5,13 @@
 _gcc=9.3.0
 _isl=0.22
 pkgver=0.37
-pkgrel=8
+pkgrel=9
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'
 license=('GPL2')
 depends=('gcc-ada')
+checkdepends=('python')
 makedepends=('gmp' 'mpfr' 'libmpc' 'zlib' 'llvm' 'clang')
 provides=('ghdl')
 conflicts=('ghdl')
@@ -56,8 +57,9 @@
   --disable-werror \
   --enable-checks \
   --enable-libghdl \
-  --enable-openieee \
   --enable-synth $@
+
+#  --enable-openieee \
 }
 
 build() {
@@ -115,6 +117,19 @@
   ghdllib
 }
 
+check() {
+  cd $pkgbase-$pkgver/testsuite
+
+  echo 'Running tests for ghdl-mcode...'
+  GHDL="$srcdir"/ghdl-mcode/ghdl_mcode ./testsuite.sh
+
+  echo 'Running tests for ghdl-llvm...'
+  GHDL="$srcdir"/ghdl-llvm/ghdl1-llvm ./testsuite.sh
+
+  echo 'Running tests for ghdl-gcc...'
+  GHDL="$srcdir"/gcc-build/gcc/ghdl ./testsuite.sh
+}
+
 package_ghdl-mcode() {
   pkgdesc="$pkgdesc (mcode backend)"
 


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

2020-04-19 Thread Filipe Laíns via arch-commits
Date: Sunday, April 19, 2020 @ 16:44:23
  Author: ffy00
Revision: 616516

upgpkg: ghdl 0.37-8 (fix ghdl-llvm)

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-19 15:56:26 UTC (rev 616515)
+++ PKGBUILD2020-04-19 16:44:23 UTC (rev 616516)
@@ -5,7 +5,7 @@
 _gcc=9.3.0
 _isl=0.22
 pkgver=0.37
-pkgrel=7
+pkgrel=8
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'
@@ -133,7 +133,7 @@
   make DESTDIR="$pkgdir" install
 
   # strip binaries
-  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/ghdl -type f -and \( -executable 
-o -name '*.o' \) -exec strip '{}' \;
+  find "$pkgdir"/usr/bin/ -type f -and \( -executable -o -name '*.o' \) -exec 
strip '{}' \;
 }
 
 package_ghdl-gcc() {


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

2020-04-17 Thread Filipe Laíns via arch-commits
Date: Friday, April 17, 2020 @ 23:55:01
  Author: ffy00
Revision: 616020

upgpkg: ghdl 0.37-7 (LLVM 10 rebuild)

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-17 23:48:28 UTC (rev 616019)
+++ PKGBUILD2020-04-17 23:55:01 UTC (rev 616020)
@@ -5,7 +5,7 @@
 _gcc=9.3.0
 _isl=0.22
 pkgver=0.37
-pkgrel=6
+pkgrel=7
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'


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

2020-04-17 Thread Filipe Laíns via arch-commits
Date: Friday, April 17, 2020 @ 23:48:19
  Author: ffy00
Revision: 616018

upgpkg: ghdl 0.37-6 (refactor and fix ghdl-gcc)

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |   63 -
 1 file changed, 29 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-17 22:55:27 UTC (rev 616017)
+++ PKGBUILD2020-04-17 23:48:19 UTC (rev 616018)
@@ -5,7 +5,7 @@
 _gcc=9.3.0
 _isl=0.22
 pkgver=0.37
-pkgrel=5
+pkgrel=6
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'
@@ -50,10 +50,7 @@
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 }
 
-build() {
-  echo 'Building ghdl-mcode...'
-  cd "$srcdir"/ghdl-mcode
-
+_configure() {
   ./configure \
   --prefix=/usr \
   --disable-werror \
@@ -60,21 +57,21 @@
   --enable-checks \
   --enable-libghdl \
   --enable-openieee \
-  --enable-synth
+  --enable-synth $@
+}
 
+build() {
+  echo 'Building ghdl-mcode...'
+  cd "$srcdir"/ghdl-mcode
+
+  _configure
+
   make
 
   echo 'Building ghdl-llvm...'
   cd "$srcdir"/ghdl-llvm
 
-  ./configure \
-  --prefix=/usr \
-  --with-llvm-config \
-  --disable-werror \
-  --enable-checks \
-  --enable-libghdl \
-  --enable-openieee \
-  --enable-synth
+  _configure --with-llvm-config
 
   make
 
@@ -81,14 +78,7 @@
   echo 'Building ghdl-gcc...'
   cd "$srcdir"/ghdl-gcc
 
-  ./configure \
-  --prefix=/usr \
-  --with-gcc="$srcdir"/gcc-$_gcc \
-  --disable-werror \
-  --enable-checks \
-  --enable-libghdl \
-  --enable-openieee \
-  --enable-synth
+  _configure --with-gcc="$srcdir"/gcc-$_gcc
 
   make copy-sources
 
@@ -101,14 +91,17 @@
   --enable-languages=vhdl \
   --enable-default-pie \
   --enable-default-ssp \
-  --with-system-zlib \
   --with-isl \
+  --enable-plugin \
+  --enable-lto \
   --disable-bootstrap \
-  --disable-lto \
   --disable-multilib \
+  --disable-libada \
+  --disable-libsanitizer \
   --disable-libssp \
+  --disable-libquadmath \
   --disable-libgomp \
-  --disable-libquadmath \
+  --disable-libvtv \
   --with-pkgversion='Arch Linux Repositories' \
   --with-bugurl='https://bugs.archlinux.org/'
 
@@ -133,6 +126,7 @@
 package_ghdl-llvm() {
   pkgdesc="$pkgdesc (LLVM backend)"
   depends+=('llvm-libs')
+  options=(!emptydirs)
 
   cd $pkgname
 
@@ -148,16 +142,18 @@
 
   cd "$srcdir"/gcc-build
 
-  mkdir "$srcdir"/dest
-  make DESTDIR="$srcdir"/dest install
+  make DESTDIR="$pkgdir" install
 
-  # manually install the files
-  install -dm 755 "$pkgdir"/usr/{bin,lib/{ghdl,gcc/x86_64-pc-linux-gnu/$_gcc}}
-  install -Dm 755 "$srcdir"/dest/usr/bin/ghdl "$pkgdir"/usr/bin/ghdl
-  install -Dm 644 "$srcdir"/dest/usr/lib/ghdl/libbacktrace.a 
"$pkgdir"/usr/lib/ghdl/libbacktrace.a
-  install -Dm 644 "$srcdir"/dest/usr/share/info/ghdl.info 
"$pkgdir"/usr/share/info/ghdl.info
-  install -Dm 644 "$srcdir"/dest/usr/lib/gcc/x86_64-pc-linux-gnu/$_gcc/ghdl1 
"$pkgdir"/usr/lib/gcc/x86_64-pc-linux-gnu/$_gcc/ghdl1
+  # Remove files that conflict with the system gcc -- we only want to install 
the ghdl plugin
+  for FILE in $(find "$pkgdir" -not -type d); do
+if [ -f /"${FILE#"$pkgdir"}" ]; then
+  rm -f "$FILE"
+fi
+  done
 
+  find "$pkgdir"/usr/share -not -type d -not -name '*ghdl*' -delete
+  rm -rf "$pkgdir"/usr/lib64
+
   # strip binaries
   find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc -type f -and \( -executable -o 
-name '*.o' \) -exec strip '{}' \;
 
@@ -164,6 +160,5 @@
   cd "$srcdir"/ghdl-gcc
 
   make DESTDIR="$pkgdir" install
-
 }
 


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

2020-04-12 Thread Filipe Laíns via arch-commits
Date: Sunday, April 12, 2020 @ 16:28:58
  Author: ffy00
Revision: 613433

strip .o objects in ghdl-gcc

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-12 16:28:13 UTC (rev 613432)
+++ PKGBUILD2020-04-12 16:28:58 UTC (rev 613433)
@@ -159,7 +159,7 @@
   install -Dm 644 "$srcdir"/dest/usr/lib/gcc/x86_64-pc-linux-gnu/$_gcc/ghdl1 
"$pkgdir"/usr/lib/gcc/x86_64-pc-linux-gnu/$_gcc/ghdl1
 
   # strip binaries
-  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc -type f -and \( -executable \) 
-exec strip '{}' \;
+  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc -type f -and \( -executable -o 
-name '*.o' \) -exec strip '{}' \;
 
   cd "$srcdir"/ghdl-gcc
 


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

2020-04-12 Thread Filipe Laíns via arch-commits
Date: Sunday, April 12, 2020 @ 15:50:59
  Author: ffy00
Revision: 613425

upgpkg: ghdl 0.37-5 (LLVM 10 rebuild)

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-12 15:29:11 UTC (rev 613424)
+++ PKGBUILD2020-04-12 15:50:59 UTC (rev 613425)
@@ -5,7 +5,7 @@
 _gcc=9.3.0
 _isl=0.22
 pkgver=0.37
-pkgrel=4
+pkgrel=5
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'


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

2020-04-12 Thread Filipe Laíns via arch-commits
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
===
--- PKGBUILD2020-04-12 15:08:45 UTC (rev 613422)
+++ PKGBUILD2020-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
+
 }
 


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

2020-04-11 Thread Filipe Laíns via arch-commits
Date: Saturday, April 11, 2020 @ 19:36:14
  Author: ffy00
Revision: 613355

upgpkg: ghdl 0.37-2 (LLVM 10 rebuild)

Modified:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-11 19:24:12 UTC (rev 613354)
+++ PKGBUILD2020-04-11 19:36:14 UTC (rev 613355)
@@ -5,7 +5,7 @@
 _gcc=9.3.0
 _isl=0.22
 pkgver=0.37
-pkgrel=1
+pkgrel=2
 pkgdesc='VHDL simulator'
 arch=('x86_64')
 url='https://github.com/ghdl/ghdl'
@@ -17,13 +17,21 @@
 validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06') # Jakub Jelinek 

 source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
 "https://ftp.gnu.org/gnu/gcc/gcc-$_gcc/gcc-$_gcc.tar.xz"{,.sig}
-"http://isl.gforge.inria.fr/isl-$_isl.tar.bz2;)
+"http://isl.gforge.inria.fr/isl-$_isl.tar.bz2;
+
"fix-llvm10.patch::$url/commit/cfb359f0b05e9042c1045213b93b09e465fa8ccc.patch")
 
sha512sums=('1ecb12379a99948740e795a51a5a7454a4231064e20b779355c4450ee6b3f6622285b6aa9b9cc53fc23352b1a017f0c735d7e567f42fbfff54d697c4cc0b6be9'
 
'4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de'
 'SKIP'
-
'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668')
+
'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668'
+
'67aff7e7bdcf4b517074a3f436ee2b1fc9b4b1d9d618fe6df0b7819cb44471d051682b1c78e95ce67616563e0714a6297c9936af79d784d49778a8a9cbdad36b')
 
 prepare() {
+  cd $pkgbase-$pkgver
+
+  patch -p1 -i ../fix-llvm10.patch
+
+  cd "$srcdir"
+
   cp -r $pkgbase-$pkgver ghdl-mcode
   cp -r $pkgbase-$pkgver ghdl-llvm
   cp -r $pkgbase-$pkgver ghdl-gcc


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

2020-04-11 Thread Filipe Laíns via arch-commits
Date: Saturday, April 11, 2020 @ 19:24:12
  Author: ffy00
Revision: 613354

prepare to build ghdllib for ghdl-gcc

Modified:
  ghdl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-04-11 18:58:43 UTC (rev 613353)
+++ PKGBUILD2020-04-11 19:24:12 UTC (rev 613354)
@@ -102,6 +102,10 @@
   --with-bugurl='https://bugs.archlinux.org/'
 
   make
+
+#  cd "$srcdir"/ghdl-gcc
+#
+#  make ghdllib
 }
 
 package_ghdl-mcode() {
@@ -128,8 +132,12 @@
   pkgdesc="$pkgdesc (GCC backend)"
   options=(!emptydirs)
 
-  cd gcc-build
+#  cd "$srcdir"/ghdl-gcc
+#
+#  make DESTDIR="$pkgdir" install
 
+  cd "$srcdir"/gcc-build
+
   mkdir "$srcdir"/dest
   make DESTDIR="$srcdir"/dest install
 


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

2020-04-11 Thread Filipe Laíns via arch-commits
Date: Saturday, April 11, 2020 @ 18:36:09
  Author: ffy00
Revision: 613350

upgpkg: ghdl 0.37-1

Added:
  ghdl/trunk/PKGBUILD

--+
 PKGBUILD |  146 +
 1 file changed, 146 insertions(+)

Added: PKGBUILD
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2020-04-11 18:36:09 UTC (rev 613350)
@@ -0,0 +1,146 @@
+# Maintainer: Filipe Laíns (FFY00) 
+
+pkgbase=ghdl
+pkgname=('ghdl-mcode' 'ghdl-llvm' 'ghdl-gcc')
+_gcc=9.3.0
+_isl=0.22
+pkgver=0.37
+pkgrel=1
+pkgdesc='VHDL simulator'
+arch=('x86_64')
+url='https://github.com/ghdl/ghdl'
+license=('GPL2')
+depends=('gcc-ada')
+makedepends=('gmp' 'mpfr' 'libmpc' 'zlib' 'llvm' 'clang')
+provides=('ghdl')
+conflicts=('ghdl')
+validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06') # Jakub Jelinek 

+source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+"https://ftp.gnu.org/gnu/gcc/gcc-$_gcc/gcc-$_gcc.tar.xz"{,.sig}
+"http://isl.gforge.inria.fr/isl-$_isl.tar.bz2;)
+sha512sums=('1ecb12379a99948740e795a51a5a7454a4231064e20b779355c4450ee6b3f6622285b6aa9b9cc53fc23352b1a017f0c735d7e567f42fbfff54d697c4cc0b6be9'
+
'4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de'
+'SKIP'
+
'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668')
+
+prepare() {
+  cp -r $pkgbase-$pkgver ghdl-mcode
+  cp -r $pkgbase-$pkgver ghdl-llvm
+  cp -r $pkgbase-$pkgver ghdl-gcc
+
+  mkdir gcc-build
+
+  cd gcc-$_gcc
+
+  ln -s ../isl-$_isl isl
+
+  echo $_gcc > gcc/BASE-VER
+
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+}
+
+build() {
+  echo 'Building ghdl-mcode...'
+  cd "$srcdir"/ghdl-mcode
+
+  ./configure \
+  --prefix=/usr \
+  --disable-werror \
+  --enable-checks \
+  --enable-libghdl \
+  --enable-openieee \
+  --enable-synth
+
+  make
+
+  echo 'Building ghdl-llvm...'
+  cd "$srcdir"/ghdl-llvm
+
+  ./configure \
+  --prefix=/usr \
+  --with-llvm-config \
+  --disable-werror \
+  --enable-checks \
+  --enable-libghdl \
+  --enable-openieee \
+  --enable-synth
+
+  make
+
+  echo 'Building ghdl-gcc...'
+  cd "$srcdir"/ghdl-gcc
+
+  ./configure \
+  --prefix=/usr \
+  --with-gcc="$srcdir"/gcc-$_gcc \
+  --disable-werror \
+  --enable-checks \
+  --enable-libghdl \
+  --enable-openieee \
+  --enable-synth
+
+  make copy-sources
+
+  cd "$srcdir"/gcc-build
+
+  "$srcdir"/gcc-$_gcc/configure \
+  --prefix=/usr \
+  --libdir=/usr/lib \
+  --libexecdir=/usr/lib \
+  --enable-languages=vhdl \
+  --enable-default-pie \
+  --with-system-zlib \
+  --with-isl \
+  --disable-bootstrap \
+  --disable-lto \
+  --disable-multilib \
+  --disable-libssp \
+  --disable-libgomp \
+  --disable-libquadmath \
+  --with-pkgversion='Arch Linux Repositories' \
+  --with-bugurl='https://bugs.archlinux.org/'
+
+  make
+}
+
+package_ghdl-mcode() {
+  pkgdesc="$pkgdesc (mcode backend)"
+
+  cd $pkgname
+
+  make DESTDIR="$pkgdir" install
+}
+
+package_ghdl-llvm() {
+  pkgdesc="$pkgdesc (LLVM backend)"
+  depends+=('llvm-libs')
+
+  cd $pkgname
+
+  make DESTDIR="$pkgdir" install
+
+  # strip binaries
+  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/ghdl -type f -and \( -executable 
-o -name '*.o' \) -exec strip '{}' \;
+}
+
+package_ghdl-gcc() {
+  pkgdesc="$pkgdesc (GCC backend)"
+  options=(!emptydirs)
+
+  cd gcc-build
+
+  mkdir "$srcdir"/dest
+  make DESTDIR="$srcdir"/dest install
+
+  # manually install the files
+  install -dm 755 "$pkgdir"/usr/{bin,lib/{ghdl,gcc/x86_64-pc-linux-gnu/$_gcc}}
+  install -Dm 755 "$srcdir"/dest/usr/bin/ghdl "$pkgdir"/usr/bin/ghdl
+  install -Dm 644 "$srcdir"/dest/usr/lib/ghdl/libbacktrace.a 
"$pkgdir"/usr/lib/ghdl/libbacktrace.a
+  install -Dm 644 "$srcdir"/dest/usr/share/info/ghdl.info 
"$pkgdir"/usr/share/info/ghdl.info
+  install -Dm 644 "$srcdir"/dest/usr/lib/gcc/x86_64-pc-linux-gnu/$_gcc/ghdl1 
"$pkgdir"/usr/lib/gcc/x86_64-pc-linux-gnu/$_gcc/ghdl1
+
+  # strip binaries
+  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc -type f -and \( -executable \) 
-exec strip '{}' \;
+}
+