clean some PKGBUILDs

mingw-w64-cython/PKGBUILD

@@ -28,8 +28,6 @@ sha256sums=('7146dd2af8682b4ca61331851e6aebce9fe5158e75300343f80c07ca80b1faff')
 build() {
   cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
 
-  # avoid clang32 OOMing by reducing memory usage
-  [[ ${MSYSTEM} == CLANG32 ]] && CFLAGS+=" -g0"
   ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
 }
 

mingw-w64-doxygen/PKGBUILD

@@ -75,12 +75,6 @@ build() {
     _extra_config+=("-Dbuild_wizard=ON")
   fi
 
-  if [[ "${MSYSTEM}" == "CLANG32" ]]; then
-    # https://github.com/msys2/MINGW-packages/issues/11787
-    _extra_config+=("-DCMAKE_CXX_FLAGS_RELEASE=-O1 -DNDEBUG")
-    _extra_config+=("-DDCMAKE_C_FLAGS_RELEASE=-O1 -DNDEBUG")
-  fi
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake -Wno-dev \
     -G"Ninja" \

mingw-w64-fftw/PKGBUILD

@@ -48,11 +48,6 @@ prepare() {
 }
 
 build() {
-  # clang complains when trying to use an sse2 intrinsic if sse2 is not enabled
-  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-i686* ]]; then
-    CFLAGS+=" -msse2"
-  fi
-
   for cur in ${precision}; do
     [[ -d "${srcdir}"/build-${MSYSTEM}-${cur} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-${cur}
     mkdir -p "${srcdir}"/build-${MSYSTEM}-${cur} && cd "${srcdir}"/build-${MSYSTEM}-${cur}

mingw-w64-libsoxr/PKGBUILD

@@ -16,8 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "git")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-          $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-i686-* && ${MINGW_PACKAGE_PREFIX} != *-clang-x86_64-* ]] \
+         "${MINGW_PACKAGE_PREFIX}-omp")
-            || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
 source=("git+https://git.code.sf.net/p/soxr/code#commit=945b592b70470e29f917f4de89b4281fbbd540c0"
         "0001-libsoxr-fix-pkgconfig-file.patch"
         "0002-libsoxr-fix-documentation-installation.patch"

mingw-w64-luajit/PKGBUILD

@@ -57,7 +57,7 @@ build() {
   cd "${_realname}"
 
   XCFLAGS=-DLUAJIT_ENABLE_GC64
-  if [[ "$MSYSTEM" == "MINGW32" || "$MSYSTEM" == "CLANG32" ]]; then
+  if [[ "${CARCH}" == "i686" ]]; then
     # https://github.com/msys2/MINGW-packages/issues/17042
     XCFLAGS+=" -DLUAJIT_NO_UNWIND"
   fi

mingw-w64-msmpi/PKGBUILD

@@ -12,9 +12,7 @@ url="https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi"
 license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-cc"
-         $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* && ${MSYSTEM} != CLANG64 ]] || \
+         "${MINGW_PACKAGE_PREFIX}-fc")
-           echo "${MINGW_PACKAGE_PREFIX}-fc")
-         )
 optdepends=("${MINGW_PACKAGE_PREFIX}-tcl: build & run test suite")
 options=('strip')
 source=(
@@ -61,10 +59,8 @@ build() {
   # Headers
   mkdir -p include
   cp $srcdir/mpi.h include
-  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* || ${MSYSTEM} == CLANG64 ]]; then
+  cp $srcdir/{mpif.h,mpi.f90} include
-    cp $srcdir/{mpif.h,mpi.f90} include
+  cp $srcdir/mpifptr.h.${CARCH} include/mpifptr.h
-    cp $srcdir/mpifptr.h.${CARCH} include/mpifptr.h
-  fi
 
   # C/C++ Compiler wrappers
   mkdir -p bin
@@ -78,17 +74,13 @@ build() {
   cp bin/mpicxx.exe bin/mpic++.exe
 
   # Fortran Compiler wrappers
-  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* || ${MSYSTEM} == CLANG64 ]]; then
+  $CC ${cflags} -o bin/mpifort.exe -DFC "${mpic}"
-    $CC ${cflags} -o bin/mpifort.exe -DFC "${mpic}"
+  cp bin/mpifort.exe bin/mpif77.exe
-    cp bin/mpifort.exe bin/mpif77.exe
+  cp bin/mpifort.exe bin/mpif90.exe
-    cp bin/mpifort.exe bin/mpif90.exe
-  fi
 
   # FORTRAN90 MPI modules
-  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* || ${MSYSTEM} == CLANG64 ]]; then
+  bin/mpifort -c -Jinclude -cpp ${srcdir}/mpi.f90
-    bin/mpifort -c -Jinclude -cpp ${srcdir}/mpi.f90
+  rm mpi.o
-    rm mpi.o
-  fi
 }
 
 package() {

mingw-w64-netcdf-cxx/PKGBUILD

@@ -37,7 +37,7 @@ build() {
     --prefix="${MINGW_PREFIX}"
 
   # file VERSION (generated by configure) confuses those
-  # CLANG32/64 header files which #include <version>
+  # CLANG* header files which #include <version>
   mv -f VERSION .VERSION
 
   make libh5bzip2_la_LIBADD=-lhdf5 LIBS=-lnetcdf

mingw-w64-opencascade/PKGBUILD

@@ -169,12 +169,6 @@ build() {
     )
   fi
 
-  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-i686 ]]; then
-    common_config+=(
-      -DBUILD_DOC_Overview=Off
-    )
-  fi
-
   declare -a _extra_config
   if check_option "debug" "n"; then
     _extra_config+=("-DCMAKE_BUILD_TYPE=Release")

mingw-w64-petsc/PKGBUILD

@@ -126,14 +126,10 @@ _petsc() {
     libs+=" -lgfortran -lquadmath"
     pc_libs="$libs"
   else
-  # elif [[ ${MSYSTEM} == CLANG32 ]]; then
     opts+=" --with-fc=0"
-  # else
+    # opts+=" --with-fc=${MINGW_PREFIX}/bin/flang"
-  #   opts+=" --with-fc=${MINGW_PREFIX}/bin/flang"
-  #   libs+=" -lFortranRuntime -lFortranDecimal"
-  # fi
-  # if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
     cflags+=" -Wno-incompatible-function-pointer-types"
+    # libs+=" -lFortranRuntime -lFortranDecimal"
   fi
   case $1 in
     ?m?)

mingw-w64-python-lxml/PKGBUILD

@@ -56,9 +56,6 @@ build() {
   rm -rf python-build-${MSYSTEM} | true
   cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
 
-  # avoid clang32 OOMing by reducing memory usage
-  [[ ${MSYSTEM} == CLANG32 ]] && CFLAGS+=" -g0"
-
   ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation \
     -C--build-option=--with-cython -C--build-option=--with-unicode-strings
 }

mingw-w64-skia/PKGBUILD

@@ -104,14 +104,12 @@ build() {
         BUILDTYPE="Debug"
     fi
 
-    case ${CARCH} in
+    if [[ ${CARCH} == aarch64 ]]; then
-    i686)
+        _arch=arm64
-        _arch=x86
+    else
-        ;;
-    x86_64)
         _arch=x64
-        ;;
+    fi
-    esac
+
     case ${BUILDTYPE} in
     Release)
         _is_official=true
@@ -121,20 +119,13 @@ build() {
         ;;
     esac
 
-    case ${MSYSTEM} in
+    if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
-    CLANG64|CLANG32)
-        export CXX=clang++
-        export CC=clang
         export LD=clang++
         export AR=llvm-ar
-    ;;
+    else
-    *)
-        export CXX=g++
-        export CC=gcc
         export LD=g++
         export AR=ar
-    ;;
+    fi
-    esac
 
     cd "${srcdir}"/skia
     ${MINGW_PREFIX}/bin/gn gen "${PWD}/out/${BUILDTYPE}-${MSYSTEM}" --args="

mingw-w64-superlu/PKGBUILD

@@ -14,7 +14,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-openblas")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-            #$( [[ ${MSYSTEM} == CLANG32 ]] || echo "${MINGW_PACKAGE_PREFIX}-fc"))
+            #"${MINGW_PACKAGE_PREFIX}-fc")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-tcl")
 source=("https://github.com/xiaoyeli/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         'all.tcl'
@@ -58,11 +58,7 @@ build() {
 
   mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
-  # if [[ ${MSYSTEM} == CLANG32 ]]; then
+  # _extra_config+=("-DXSDK_ENABLE_Fortran=ON")
-  #   _extra_config+=("-DXSDK_ENABLE_Fortran=OFF")
-  # else
-  #   _extra_config+=("-DXSDK_ENABLE_Fortran=ON")
-  # fi
 
   MSYS2_ARG_CONV_EXCL='-DCMAKE_INSTALL_PREFIX=' \
     ${MINGW_PREFIX}/bin/cmake.exe \

mingw-w64-vapoursynth/PKGBUILD

@@ -87,9 +87,6 @@ package() {
   export LDFLAGS="-L$(cygpath -wm $pkgdir)/${MINGW_PREFIX}/lib $LDFLAGS"
   cd "${srcdir}/${_realname}-R${pkgver}"
 
-  # avoid clang32 OOMing by reducing memory usage
-  [[ ${MSYSTEM} == CLANG32 ]] && CFLAGS+=" -g0"
-
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1