diff --git a/mingw-w64-netcdf-cxx/0001-netcdf-cxx-4.3.1-examples-fix-plugin-name-on-MINGW32-64-and-CLANG32-64.patch b/mingw-w64-netcdf-cxx/0001-netcdf-cxx-4.3.1-examples-fix-plugin-name-on-MINGW32-64-and-CLANG32-64.patch new file mode 100644 index 0000000000..329f58aaea --- /dev/null +++ b/mingw-w64-netcdf-cxx/0001-netcdf-cxx-4.3.1-examples-fix-plugin-name-on-MINGW32-64-and-CLANG32-64.patch @@ -0,0 +1,35 @@ +From 7626f7a9b57e83aad48566028f2d5dab4ad8a0f3 Mon Sep 17 00:00:00 2001 +Date: Tue, 1 Nov 2022 17:01:26 +0100 +Subject: examples: fix plugin name on MINGW32/64 and CLANG32/64 + +* examples/findplugin.in: + add plugin name on MINGW32/64 and CLANG32/64 +--- +diff --git a/examples/findplugin.in b/examples/findplugin.in +index 0656823..29560ad 100644 +--- a/examples/findplugin.in ++++ b/examples/findplugin.in +@@ -39,6 +39,11 @@ if test "x$FP_OS" = xDarwin ; then FP_ISOSX=1; fi + FP_OS=`uname | cut -d '_' -f 1` + if test "x$FP_OS" = xCYGWIN ; then FP_ISCYGWIN=1; fi + ++FP_IS_OTHER_WIN= ++case $FP_OS in ++ MINGW* | CLANG* ) FP_IS_OTHER_WIN=1;; ++esac ++ + FP_PLUGINS="$topbuilddir/plugins" + + FP_PLUGIN_LIB= +@@ -50,6 +55,8 @@ if test "x$FP_ISMSVC" != x ; then + FP_PLUGIN_LIB="${FP_NAME}.dll" + elif test "x$FP_ISCYGWIN" != x ; then + FP_PLUGIN_LIB="cyg${FP_NAME}.dll" ++elif test "x$FP_IS_OTHER_WIN" != x ; then ++ FP_PLUGIN_LIB="lib${FP_NAME}.dll" + elif test "x$FP_ISOSX" != x ; then + FP_PLUGIN_LIB="lib${FP_NAME}.so" # Should this include the version number in the name? + else # Presumably some form on *nix" +-- +2.36.1.windows.1 + diff --git a/mingw-w64-netcdf-cxx/PKGBUILD b/mingw-w64-netcdf-cxx/PKGBUILD index 17e410b617..b0be4838cd 100644 --- a/mingw-w64-netcdf-cxx/PKGBUILD +++ b/mingw-w64-netcdf-cxx/PKGBUILD @@ -3,21 +3,30 @@ _realname=netcdf-cxx pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=4.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="NetCDF C++ bindings (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://github.com/Unidata/netcdf-cxx4/" license=(custom) -depends=("${MINGW_PACKAGE_PREFIX}-autotools" - "${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-netcdf>=4.6.0") -source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") -sha256sums=('e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc') +depends=( + "${MINGW_PACKAGE_PREFIX}-netcdf>=4.6.0" + 'sed' # for ncxx4-config + ) +makedepends=( + "${MINGW_PACKAGE_PREFIX}-autotools" + "${MINGW_PACKAGE_PREFIX}-cc" + ) +source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" + '0001-netcdf-cxx-4.3.1-examples-fix-plugin-name-on-MINGW32-64-and-CLANG32-64.patch') +sha256sums=('e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc' + 'dcb7f4c88e1cdfd9627c61020a77c400296aaf1a67f06549e87682b0a8df8844') prepare() { cd "${_realname}${pkgver/.*/}-${pkgver}" + patch -p1 < '../0001-netcdf-cxx-4.3.1-examples-fix-plugin-name-on-MINGW32-64-and-CLANG32-64.patch' + autoreconf -vfi } @@ -28,7 +37,7 @@ build() { --prefix="${MINGW_PREFIX}" # file VERSION (generated by configure) confuses those - # CLANG32/64 header files with #include + # CLANG32/64 header files which #include mv -f VERSION .VERSION make libh5bzip2_la_LIBADD=-lhdf5 LIBS=-lnetcdf @@ -40,5 +49,5 @@ check() { package() { make install DESTDIR="${pkgdir}" -C "build-${_realname}-${pkgver}-${MSYSTEM}" - install -Dm644 "${_realname}${pkgver/.*/}-${pkgver}"/COPYRIGHT -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${pkg_realnamename}/" + install -Dm644 "${_realname}${pkgver/.*/}-${pkgver}"/COPYRIGHT -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/" }