diff --git a/mingw-w64-octave/PKGBUILD b/mingw-w64-octave/PKGBUILD index 5ec63085ec..fa5b747c01 100644 --- a/mingw-w64-octave/PKGBUILD +++ b/mingw-w64-octave/PKGBUILD @@ -3,11 +3,11 @@ _realname=octave pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -pkgver=9.4.0 +pkgver=10.1.0 pkgrel=1 pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.octave.org" msys2_repository_url="https://github.com/gnu-octave/octave" msys2_references=( @@ -66,7 +66,7 @@ source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} "0003-no-community-support.patch" "0005-makeinfo-perl.patch") validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton -sha256sums=('fff911909ef79f95ba244dab5b8c1cb8c693a6c447d31deabb53994f17cb7b3d' +sha256sums=('051d092fe7abbed4ed9b74c8c40f3dfb1b9aa9eede770ac6c7e9c8c9e895e0c9' 'SKIP' 'aa5bd559d9774abc0f0c930a606762d1e452cc90278d16d8ae83561c0cae3bf8' 'e53af21ad087e10a2906506589aab89ab8b43f4e3e4994b4c28e4d8ae83639ad' @@ -100,7 +100,9 @@ build() { declare -a _extra_config if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then - _extra_config+=("F77=${MINGW_PREFIX}/bin/flang") + # Clang seems to require a different set of dllexport attributes than GCC. + _extra_config+=("F77=${MINGW_PREFIX}/bin/flang" + "--disable-lib-visibility-flags") # The headers from some dependent libraries (graphicsmagick++?) cause a # torrent of warnings about deprecated declarations. Sometimes to the # point that the build crashes with garbled characters in the terminal @@ -111,15 +113,12 @@ build() { CXXFLAGS+=" -Wno-deprecated-declarations -Wno-ignored-attributes" fi - # The configure step sometimes hangs for MINGW32 for currently unknown reasons. - # Add a timeout of 30 minutes (well over what should be needed) to unblock - # the build system in that case. - timeout 30m \ ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --enable-shared \ --disable-static \ --enable-relocate-all \ + --disable-docs \ "${_extra_config[@]}" \ octave_cv_fftw3_threads_lib="-lfftw3_omp" \ octave_cv_fftw3f_threads_lib="-lfftw3f_omp" \