Merge pull request #9567 from MehdiChinoune/plplot-clang

plplot: Fix building on clang subsystems

mingw-w64-plplot/PKGBUILD

@@ -18,7 +18,7 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="Scientific plotting software (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
+         $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
          "${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-libharu"
          "${MINGW_PACKAGE_PREFIX}-lua"
@@ -30,7 +30,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-qhull"
         )
 makedepends=("${MINGW_PACKAGE_PREFIX}-libgd"
-             "${MINGW_PACKAGE_PREFIX}-gcc-fortran"
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-fortran")
              #"${MINGW_PACKAGE_PREFIX}-gcc-ada"
              "${MINGW_PACKAGE_PREFIX}-swig"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
@@ -87,11 +87,18 @@ build() {
      pylib="${MINGW_PREFIX}/lib/libpython${pyver}m.dll.a"
   fi
 
+  local -a _enable_fortran
+  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then
+    _enable_fortran="ON"
+    export FC=${MINGW_PREFIX}/bin/gfortran.exe
+  else
+    _enable_fortran="OFF"
+  fi
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_Fortran_COMPILER=${MINGW_PREFIX}/bin/gfortran.exe \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_TEST=OFF \
@@ -106,7 +113,7 @@ build() {
     -DDEFAULT_NO_BINDINGS=ON \
     -DENABLE_ada=OFF \
     -DENABLE_cxx=ON \
-    -DENABLE_fortran=ON \
+    -DENABLE_fortran=${_enable_fortran} \
     -DENABLE_lua=ON \
     -DENABLE_python=ON \
     -DENABLE_tcl=ON \
@@ -122,12 +129,12 @@ build() {
     -DPLD_wingdi=ON \
     ../${_realname}-${pkgver}
 
-  make V=1
+  cmake --build .
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" cmake --install .
 
   local MINGW_PREFIX_WIN=$(cygpath -am ${MINGW_PREFIX})
   local MSYS2_USR_WIN=$(cygpath -am /usr)