ghdl: update to 0.37.0.r1261.g4d37b288

msys2 · Jan 6, 2021 · ee79c92 · ee79c92
1 parent a13c955
commit ee79c92
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/mingw-w64-ghdl/PKGBUILD b/mingw-w64-ghdl/PKGBUILD
@@ -1,18 +1,17 @@
 _realname=ghdl
 pkgbase="mingw-w64-${_realname}"
 pkgname='__placeholder__'
-pkgver=0.37.0.r1123.g8ed35277
+pkgver=0.37.0.r1261.g4d37b288
 pkgrel=1
-pkgdesc='GHDL: the open-source analyzer, compiler, simulator and (experimental) synthesizer for VHDL (mingw-w64)'
+pkgdesc='GHDL: the open-source analyzer, compiler, simulator and (experimental) synthesizer for VHDL'
 arch=('any')
 license=('GPL2+')
 url='https://github.com/ghdl'
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python")
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-makedepends=("${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-gcc-ada")
-_commit='8ed35277'
-source=("ghdl::git://github.com/ghdl/ghdl.git#commit=${_commit}")
+_commit='4d37b288'
+source=("${_realname}::git://github.com/ghdl/ghdl.git#commit=${_commit}")
 sha512sums=('SKIP')
 
 pkgver() {
@@ -26,7 +25,7 @@ build() {
 
   if [ "$CARCH" = "i686" ]; then
     echo 'Configuring ghdl-mcode...'
-    ../${_realname}/configure \
+    MSYS2_ARG_CONV_EXCL="--prefix" ../${_realname}/configure \
         --prefix=${MINGW_PREFIX} \
         --enable-checks \
         --enable-libghdl \
@@ -36,7 +35,9 @@ build() {
 
   if [ "$CARCH" = "x86_64" ]; then
     echo 'Configuring ghdl-llvm...'
-    ../${_realname}/configure \
+    export CC=clang
+    export CXX=clang++
+    MSYS2_ARG_CONV_EXCL="--prefix" ../${_realname}/configure \
         --prefix=${MINGW_PREFIX} \
         --enable-checks \
         --enable-libghdl \
@@ -51,40 +52,44 @@ build() {
 check() {
   cd "${srcdir}/build-${CARCH}"
   make install.vpi.local
-  make test
+  make CC=gcc test
 }
 
 _package() {
   cd "${srcdir}"/build-${CARCH}
-  mkdir -p "${pkgdir}${MINGW_PREFIX}/lib"
+  _lib="${pkgdir}${MINGW_PREFIX}"/lib
+  mkdir -p "${_lib}"
   make DESTDIR="${pkgdir}" install
 
+  sed -i -e 's@.*\(/mingw.*\)@\1@' "${_lib}"/libghdl.link
+
   # License
   install -Dm644 ${srcdir}/${_realname}/doc/licenses.rst ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/licenses.rst
 }
 
 if [ "${CARCH}" = "x86_64" ]; then
   pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-llvm")
-
+  makedepends=("${MINGW_PACKAGE_PREFIX}-clang")
   package() {
     pkgdesc="$pkgdesc (LLVM backend) (mingw-w64)"
     depends=(
-      "${MINGW_PACKAGE_PREFIX}-zlib"
+      "${MINGW_PACKAGE_PREFIX}-gcc-ada"
       "${MINGW_PACKAGE_PREFIX}-clang"
       "${MINGW_PACKAGE_PREFIX}-llvm"
+      "${MINGW_PACKAGE_PREFIX}-zlib"
     )
     options=(!emptydirs)
-
     _package
   }
 fi
 if [ "${CARCH}" = "i686" ]; then
   pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-mcode")
-
   package() {
     pkgdesc="$pkgdesc (mcode backend) (mingw-w64)"
-    depends=("${MINGW_PACKAGE_PREFIX}-zlib")
-
+    depends=(
+      "${MINGW_PACKAGE_PREFIX}-gcc-ada"
+      "${MINGW_PACKAGE_PREFIX}-zlib"
+    )
     _package
   }
 fi