Mercurial > mxe-octave
changeset 5751:16372b488670
maint: merge release to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 25 Apr 2021 18:31:10 +0200 |
| parents | 3960e6022e88 (diff) 04228fb2b15a (current diff) |
| children | cf43b12ddd21 |
| files | src/default-octave.mk src/release-octave.mk src/stable-octave.mk |
| diffstat | 103 files changed, 1736 insertions(+), 5382 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sun Apr 25 17:47:04 2021 +0200 +++ b/Makefile.in Sun Apr 25 18:31:10 2021 +0200 @@ -532,9 +532,11 @@ OCTAVE_FORGE_BASE_URL := 'https://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' ## Packages removed from list because build is broken: ## None. -OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim general signal communications image io statistics control geometry windows linear-algebra sockets data-smoothing fuzzy-logic-toolkit quaternion fits tsa netcdf ltfat database instrument-control generate_html nurbs strings financial stk splines dataframe lssa queueing ga interval nan ocs mapping tisean video zeromq gsl optiminterp dicom sparsersb audio symbolic matgeom octproj) +OCTAVE_FORGE_PACKAGES := $(addprefix of-,audio communications control database dataframe data-smoothing dicom financial fits fuzzy-logic-toolkit ga general generate_html geometry gsl image instrument-control interval io linear-algebra lssa ltfat mapping matgeom miscellaneous nan netcdf nurbs ocs octproj optim optiminterp quaternion queueing signal sockets sparsersb splines statistics stk strings struct symbolic tisean tsa video windows zeromq) +OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,biosig) # get ALL deps for all of- packages, regardless of whether building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_FORGE_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) +OCTAVE_OTHER_PKG_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_OTHER_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) BLAS_PACKAGES := blas ifeq ($(ENABLE_OPENBLAS),yes) @@ -703,6 +705,9 @@ .PHONY: octave-forge-packages octave-forge-packages: $(OCTAVE_FORGE_DEPS) $(OCTAVE_FORGE_PACKAGES) +.PHONY: octave-other-packages +octave-other-packages: $(OCTAVE_OTHER_PKG_DEPS) $(OCTAVE_OTHER_PACKAGES) + .PHONY: blas-packages blas-packages: $(BLAS_PACKAGES) @@ -837,18 +842,20 @@ && $(INSTALL) -m644 '$($(PKG)_FILE)' '$(3)$(HOST_PREFIX)/src' endef +# FIXME: The OCTAVE_FORGE_PKG_BUILD build rule probably works for *any* valid +# Octave package (not only Octave Forge packages). Consider renaming it. ifeq ($(MXE_SYSTEM),msvc) -define OCTAVE_FORGE_PKG_BUILD + define OCTAVE_FORGE_PKG_BUILD $(INSTALL) -d '$(3)$(HOST_PREFIX)/local/octave-$(octave_VERSION)/share/octave' $(INSTALL) -d '$(3)$(HOST_PREFIX)/local/octave-$(octave_VERSION)/lib/octave' cd '$(1)/..' && tar cvfz $($(PKG)_FILE) $($(PKG)_SUBDIR) cd '$(1)/..' && $(HOST_PREFIX)/local/octave-$(octave_VERSION)/bin/octave-cli.exe -H -f -q \ - --eval "more off;" \ - --eval "pkg('prefix', '`cd "$(3)" && pwd -W`$(HOST_PREFIX)/local/octave-$(octave_VERSION)/share/octave/packages', '`cd "$(3)" && pwd -W`$(HOST_PREFIX)/local/octave-$(octave_VERSION)/lib/octave/packages');" \ - --eval "pkg('install', '-verbose', '$($(PKG)_FILE)');" + --eval "more off;" \ + --eval "pkg('prefix', '`cd "$(3)" && pwd -W`$(HOST_PREFIX)/local/octave-$(octave_VERSION)/share/octave/packages', '`cd "$(3)" && pwd -W`$(HOST_PREFIX)/local/octave-$(octave_VERSION)/lib/octave/packages');" \ + --eval "pkg('install', '-verbose', '$($(PKG)_FILE)');" endef else -define OCTAVE_FORGE_PKG_BUILD + define OCTAVE_FORGE_PKG_BUILD if [ $(ENABLE_BINARY_PACKAGES) = no ]; then \ mkdir -p '$(3)$(HOST_PREFIX)/src'; \ cd '$(1)/..' \ @@ -863,7 +870,7 @@ CONFIGURE_OPTIONS="$(HOST_AND_BUILD_CONFIGURE_OPTIONS)" $(4) \ $(PYTHON3) $(TOP_DIR)/tools/pkg-install.py install -verbose "$($(PKG)_FILE)"; \ fi -endef + endef endif define OCTAVE_FORGE_PKG_UPDATE @@ -1015,6 +1022,11 @@ update-build-tools: $(foreach PKG,$(BUILD_TOOLS),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE)))) +.PHONY: update-general-pkgs +update-general-pkgs: + $(foreach PKG,$(filter-out $(MSYS2_PACKAGES) $(MSYS_BASE_PACKAGES) $(OCTAVE_FORGE_PACKAGES), $(PKGS)),\ + $(if $($(PKG)_UPDATE),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE))),$(info Warning: No update rule for $(PKG)))) + update-checksum-%: $(call DOWNLOAD_PKG_ARCHIVE,$*) $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(TOP_DIR)/src/$*.mk'
--- a/binary-dist-rules.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/binary-dist-rules.mk Sun Apr 25 18:31:10 2021 +0200 @@ -49,16 +49,13 @@ native-gcc \ npp endif - - # other packages we want to include - WINDOWS_BINARY_DIST_DEPS += \ - biosig endif BINARY_DIST_DEPS := \ $(OCTAVE_TARGET) \ blas-packages \ octave-forge-packages \ + octave-other-packages \ devel-packages \ units \ transfig \ @@ -118,11 +115,21 @@ cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/ + # This patch can be dropped as soon as those lines are removed from + # the startup scripts for all targets (including stable and release). + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-no-short-path.patch; \ + fi cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/ echo " updating octave .exe to script files..." rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.exe rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.bat + # This patch can be dropped as soon as those lines are removed from + # "octave.bat" for all targets (including stable and release). + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-bat-no-short-path.patch; \ + fi cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat echo " updating libtool references..." find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/' -type f -name "*.la" \ @@ -132,6 +139,9 @@ -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \ cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \ + if [ "$(OCTAVE_TARGET)" = "default-octave" ]; then \ + (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/cmdshell-no-short-path.patch; \ + fi; \ fi echo " updating script tool references..." #find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \
--- a/dist-files.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/dist-files.mk Sun Apr 25 18:31:10 2021 +0200 @@ -7,7 +7,6 @@ armadillo-1-staticlib.patch \ armadillo-test.cpp \ armadillo.mk \ - arpack-1-gcc10.patch \ arpack.mk \ atk-1-DllMain.patch \ atk.mk \ @@ -15,7 +14,6 @@ aubio-1-fix-pkg-config.patch \ aubio.mk \ bfd.mk \ - biosig.mk \ blas.mk \ blas_switch.mk \ boost-1-intrinsics-fix.patch \ @@ -77,7 +75,6 @@ dcmtk-1-fixes.patch \ dcmtk-2-mingw-w64.patch \ dcmtk-3-pointer-fixes.patch \ - dcmtk-4-c++11-related-fixes.patch \ dcmtk.mk \ default-octave-1-gnulib.patch \ default-octave.mk \ @@ -124,8 +121,10 @@ gd-test.c \ gd.mk \ gdal.mk \ + gdb-1-gnulib.patch \ gdb.mk \ gdcm-1-nosecapi.patch \ + gdcm-2-getopt.patch \ gdcm.mk \ gdk-pixbuf-1-fixes.patch \ gdk-pixbuf.mk \ @@ -142,6 +141,7 @@ glew-test.c \ glew.mk \ glib-1-fixes.patch \ + glib-2-fixes.patch \ glib.mk \ glibmm.mk \ glpk-1-fixes.patch \ @@ -156,6 +156,7 @@ gnutls.mk \ graphicsmagick-1-fix-xml2-config.patch \ graphicsmagick-2-dynamicpath.patch \ + graphicsmagick-3-user32.patch \ graphicsmagick-test.cpp \ graphicsmagick.mk \ gsl-test.c \ @@ -214,7 +215,6 @@ lame.mk \ lapack-test.f \ lapack.mk \ - lcms-1-fixes.patch \ lcms.mk \ lcms1-1-fixes.patch \ lcms1.mk \ @@ -225,6 +225,8 @@ libass-test.c \ libass.mk \ libb64.mk \ + libbiosig-1-mingw-install.patch \ + libbiosig.mk \ libcdio.mk \ libcroco.mk \ libdnet-1-fixes.patch \ @@ -306,6 +308,7 @@ libsndfile.mk \ libssh2-test.c \ libssh2.mk \ + libsodium.mk \ libtasn1.mk \ libtool.mk \ libunistring.mk \ @@ -347,9 +350,11 @@ mingw-portaudio-1-pkgconfig.patch \ mingw-s2tc-1-fixes.patch \ mingw-texinfo-1-fixes.patch \ + mingw-texinfo-2-makeinfo-non-ASCII-perl.patch \ mingw-utils-1-portability-fix.patch \ mingw-w64-1-float-h.patch \ mingw-w64.mk \ + mingw-zeromq-1-fixes.patch \ mingwrt.mk \ mman-win32-1-include_name_change.patch \ mman-win32.mk \ @@ -549,10 +554,13 @@ opencv-1-fixes.patch \ opencv.mk \ openexr.mk \ + openjpeg.mk \ openscenegraph-1-fixes.patch \ openscenegraph.mk \ openssl-1-fixes.patch \ openssl.mk \ + opkg-biosig.mk \ + opus.mk \ pango-1-fixes.patch \ pango.mk \ pangomm.mk \ @@ -628,16 +636,11 @@ qwtplot3d.mk \ rapidjson-1-prettywriter.patch \ rapidjson.mk \ - readline-0-001.patch \ - readline-0-002.patch \ - readline-0-003.patch \ - readline-0-004.patch \ readline-1-display.patch \ readline-1-fixes.patch \ readline-1-input.patch \ readline-1-sigwinch.patch \ readline-2-event-hook.patch \ - readline-2-history.patch \ readline.mk \ release-octave-1-gnulib.patch \ release-octave.mk \ @@ -708,6 +711,7 @@ texinfo.mk \ theora.mk \ tiff.mk \ + tinyxml-1-cmakelists.patch \ tinyxml-test.cpp \ tinyxml.mk \ transfig-1-fixes.patch \ @@ -744,6 +748,7 @@ winpcap.mk \ wt-1-fixes.patch \ wt.mk \ + wxwidgets-1-fixes.patch \ wxwidgets-test.cpp \ wxwidgets.mk \ x11.mk \ @@ -1069,15 +1074,18 @@ INSTALL_FILES_1 := \ cmdshell.bat \ + cmdshell-no-short-path.patch \ post-install.bat \ fc_update.bat \ gpl-3.0.txt \ octave.bat \ octave.bmp \ octave.vbs \ + octave-bat-no-short-path.patch \ octave-firsttime.vbs \ octave-hdr.bmp \ octave-logo.ico \ + octave-no-short-path.patch \ post-install.bat \ README.html INSTALL_FILES := $(addprefix installer-files/, $(INSTALL_FILES_1))
--- a/index.html Sun Apr 25 17:47:04 2021 +0200 +++ b/index.html Sun Apr 25 18:31:10 2021 +0200 @@ -966,10 +966,6 @@ <td class="website"><a href="http://www.gnu.org/software/binutils/">Binary File Descriptor library</a></td> </tr> <tr> - <td class="package">biosig</td> - <td class="website"><a href="https://biosig.sourceforge.io/">Biosig</a></td> - </tr> - <tr> <td class="package">blas</td> <td class="website"><a href="http://www.netlib.org/blas/">blas</a></td> </tr> @@ -1514,6 +1510,10 @@ <td class="website"><a href="https://libb64.sourceforge.io/">libb64</a></td> </tr> <tr> + <td class="package">libbiosig</td> + <td class="website"><a href="https://biosig.sourceforge.io/">Biosig library</a></td> + </tr> + <tr> <td class="package">libcdio</td> <td class="website"><a href="http://ftp.gnu.org/gnu/libcdio">Libcdio</a></td> </tr> @@ -1714,6 +1714,10 @@ <td class="website"><a href="http://www.libssh2.org">libssh2</a></td> </tr> <tr> + <td class="package">libsodium</td> + <td class="website"><a href="https://doc.libsodium.org/">libsodium</a></td> + </tr> + <tr> <td class="package">libtasn1</td> <td class="website"><a href="https://www.gnu.org/software/libtasn1/">libtasn1</a></td> </tr> @@ -2450,6 +2454,10 @@ <td class="website"><a href="http://www.openexr.com/">OpenEXR</a></td> </tr> <tr> + <td class="package">openjpeg</td> + <td class="website"><a href="https://www.openjpeg.org/">OpenJPEG</a></td> + </tr> + <tr> <td class="package">openscenegraph</td> <td class="website"><a href="http://www.openscenegraph.org/">OpenSceneGraph</a></td> </tr> @@ -2458,6 +2466,14 @@ <td class="website"><a href="http://www.openssl.org/">openssl</a></td> </tr> <tr> + <td class="package">opkg-biosig</td> + <td class="website"><a href="https://biosig.sourceforge.io/">Biosig Octave Package</a></td> + </tr> + <tr> + <td class="package">opus</td> + <td class="website"><a href="https://opus-codec.org/">opus</a></td> + </tr> + <tr> <td class="package">mesa</td> <td class="website"><a href="http://www.mesa3d.org/osmesa.html">Mesa</a></td> </tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/cmdshell-no-short-path.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,28 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1612087592 -3600 +# Sun Jan 31 11:06:32 2021 +0100 +# Node ID f08191da8e416c32d950679a78fe194e2753372e +# Parent fea266f67443b890a67f80336aee03c40d3a1faa +Don't use short paths (bug #59923). + +diff -r fea266f67443 -r f08191da8e41 cmdshell.bat +--- a/cmdshell.bat Sun Jan 31 10:59:32 2021 +0100 ++++ b/cmdshell.bat Sun Jan 31 11:06:32 2021 +0100 +@@ -2,16 +2,11 @@ + + set OCTAVE_HOME=%~dp0 + Rem NOTE: OCTAVE_HOME has a end \ +-Rem convert to 8.3 format +-for %%I in ("%OCTAVE_HOME%") do set OCTAVE_HOME=%%~sI + + Rem set home if not already set + if "%HOME%"=="" set HOME=%USERPROFILE% + if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH% + +-Rem set HOME to 8.3 format +-for %%I in ("%HOME%") do set HOME=%%~sI +- + set MSYSDIR=%OCTAVE_HOME% + set MSYSTEM=MSYS +
--- a/installer-files/cmdshell.bat Sun Apr 25 17:47:04 2021 +0200 +++ b/installer-files/cmdshell.bat Sun Apr 25 18:31:10 2021 +0200 @@ -16,14 +16,14 @@ set MSYSTEM=MSYS Rem if no msys-1.0, must be msys2 -if NOT EXIST %OCTAVE_HOME%bin\msys-1.0.dll set MSYSDIR=%OCTAVE_HOME%usr +if NOT EXIST "%OCTAVE_HOME%bin\msys-1.0.dll" set MSYSDIR=%OCTAVE_HOME%usr Rem 32 or 64 bit -if EXIST %OCTAVE_HOME%mingw32\bin\octave-cli.exe set MSYSTEM=MINGW32 -if EXIST %OCTAVE_HOME%mingw64\bin\octave-cli.exe set MSYSTEM=MINGW64 +if EXIST "%OCTAVE_HOME%mingw32\bin\octave-cli.exe" set MSYSTEM=MINGW32 +if EXIST "%OCTAVE_HOME%mingw64\bin\octave-cli.exe" set MSYSTEM=MINGW64 -if EXIST %OCTAVE_HOME%mingw32\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%mingw32\ -if EXIST %OCTAVE_HOME%mingw64\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%mingw64\ +if EXIST "%OCTAVE_HOME%mingw32\bin\octave-cli.exe" set OCTAVE_HOME=%OCTAVE_HOME%mingw32\ +if EXIST "%OCTAVE_HOME%mingw64\bin\octave-cli.exe" set OCTAVE_HOME=%OCTAVE_HOME%mingw64\ Rem Set up PATH. Make sure the octave bin dir Rem comes first. @@ -35,5 +35,5 @@ Rem tell msys2 to use the paths we set here which matches what octave would do set MSYS2_PATH_TYPE=inherit -%MSYSDIR%\bin\bash.exe --login -i +"%MSYSDIR%\bin\bash.exe" --login -i
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/octave-bat-no-short-path.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,30 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1612087592 -3600 +# Sun Jan 31 11:06:32 2021 +0100 +# Node ID f08191da8e416c32d950679a78fe194e2753372e +# Parent fea266f67443b890a67f80336aee03c40d3a1faa +Don't use short paths (bug #59923). + +diff -r fea266f67443 -r f08191da8e41 octave.bat +--- a/octave.bat Sun Jan 31 10:59:32 2021 +0100 ++++ b/octave.bat Sun Jan 31 11:06:32 2021 +0100 +@@ -8,9 +8,6 @@ + Rem Note: the result ends with a backslash. + set OCT_HOME=%~dp0\.\..\ + set ROOT_PATH=%~dp0\.\..\..\ +-Rem Convert to 8.3 format so we don't have to worry about spaces. +-for %%I in ("%OCT_HOME%") do set OCT_HOME=%%~sI +-for %%I in ("%ROOT_PATH%") do set ROOT_PATH=%%~sI + + set MSYSTEM=MSYS + set MSYSPATH=%OCT_HOME% +@@ -44,8 +41,6 @@ + Rem set home if not already set + if "%HOME%"=="" set HOME=%USERPROFILE% + if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH% +-Rem set HOME to 8.3 format +-for %%I in ("%HOME%") do set HOME=%%~sI + + Rem Check for args to determine if GUI (--gui, --force-gui) + Rem or CLI (--no-gui) should be started.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer-files/octave-no-short-path.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,70 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1612087592 -3600 +# Sun Jan 31 11:06:32 2021 +0100 +# Node ID f08191da8e416c32d950679a78fe194e2753372e +# Parent fea266f67443b890a67f80336aee03c40d3a1faa +Don't use short paths (bug #59923). + +diff -r fea266f67443 -r f08191da8e41 octave-firsttime.vbs +--- a/octave-firsttime.vbs Sun Jan 31 10:59:32 2021 +0100 ++++ b/octave-firsttime.vbs Sun Jan 31 11:06:32 2021 +0100 +@@ -21,11 +21,6 @@ + OctavePath = OctavePath & "\mingw32" + End If + +-' get path as a 8.3 path +-Set fo = fso.GetFolder(OctavePath) +-OctavePath = fo.ShortPath +-Set fo = Nothing +- + ' set up path to ensure octave bin comes first + Set wshSystemEnv = wshShell.Environment( "PROCESS" ) + if OctavePath <> MSysPath Then +@@ -42,9 +37,6 @@ + + If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then + Home = wshSystemEnv("USERPROFILE") +- Set fo = fso.GetFolder(Home) +- wshSystemEnv("HOME") = fo.ShortPath +- Set fo = Nothing + End If + + ' set Qt plugin directory and path +diff -r fea266f67443 -r f08191da8e41 octave.vbs +--- a/octave.vbs Sun Jan 31 10:59:32 2021 +0100 ++++ b/octave.vbs Sun Jan 31 11:06:32 2021 +0100 +@@ -21,11 +21,6 @@ + OctavePath = OctavePath & "\mingw32" + End If + +-' get path as a 8.3 path +-Set fo = fso.GetFolder(OctavePath) +-OctavePath = fo.ShortPath +-Set fo = Nothing +- + ' set up path to ensure octave bin comes first + Set wshSystemEnv = wshShell.Environment( "PROCESS" ) + if OctavePath <> MSysPath Then +@@ -43,9 +38,6 @@ + + If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then + Home = wshSystemEnv("USERPROFILE") +- Set fo = fso.GetFolder(Home) +- wshSystemEnv("HOME") = fo.ShortPath +- Set fo = Nothing + End If + + ' set Qt plugin directory and path +diff -r fea266f67443 -r 64ff1a717a28 post-install.bat +--- a/post-install.bat Sun Jan 31 10:59:32 2021 +0100 ++++ b/post-install.bat Sun Jan 31 11:16:33 2021 +0100 +@@ -1,8 +1,6 @@ + @echo off + Rem Run on initial install /update + set ROOT_DIR=%~dp0 +-Rem Convert to 8.3 format so we don't have to worry about spaces. +-for %%I in ("%ROOT_DIR%") do set ROOT_DIR=%%~sI + + set MSYSDIR=%ROOT_DIR% + set MSYSTEM=MSYS
--- a/installer-files/post-install.bat Sun Apr 25 17:47:04 2021 +0200 +++ b/installer-files/post-install.bat Sun Apr 25 18:31:10 2021 +0200 @@ -7,9 +7,9 @@ set MSYSDIR=%ROOT_DIR% set MSYSTEM=MSYS -if NOT EXIST %ROOT_DIR%\bin\msys-1.0.dll set MSYSDIR=%ROOT_DIR%\usr -if EXIST %ROOT_DIR%\mingw32\bin\octave.bat set MSYSTEM=MINGW32 -if EXIST %ROOT_DIR%\mingw64\bin\octave.bat set MSYSTEM=MINGW64 +if NOT EXIST "%ROOT_DIR%\bin\msys-1.0.dll" set MSYSDIR=%ROOT_DIR%\usr +if EXIST "%ROOT_DIR%\mingw32\bin\octave.bat" set MSYSTEM=MINGW32 +if EXIST "%ROOT_DIR%\mingw64\bin\octave.bat" set MSYSTEM=MINGW64 if %MSYSTEM%==MSYS ( set OCTAVE_HOME=%ROOT_DIR% @@ -29,15 +29,15 @@ Rem Create qt.conf set QT_CONF=%OCTAVE_HOME%\bin\qt.conf -echo [Paths] > %QT_CONF% -echo Prefix=%OCTAVE_HOME:\=/% >> %QT_CONF% -echo Documentation=%QT_SUBDIR%doc >> %QT_CONF% -echo Headers=%QT_SUBDIR%include >> %QT_CONF% -echo Libraries=%QT_SUBDIR%libs >> %QT_CONF% -echo Plugins=%QT_SUBDIR%plugins >> %QT_CONF% -echo Translations=%QT_SUBDIR%translations >> %QT_CONF% +echo [Paths] > "%QT_CONF%" +echo Prefix="%OCTAVE_HOME:\=/%" >> "%QT_CONF%" +echo Documentation=%QT_SUBDIR%doc >> "%QT_CONF%" +echo Headers=%QT_SUBDIR%include >> "%QT_CONF%" +echo Libraries=%QT_SUBDIR%libs >> "%QT_CONF%" +echo Plugins=%QT_SUBDIR%plugins >> "%QT_CONF%" +echo Translations=%QT_SUBDIR%translations >> "%QT_CONF%" -Rem run bash to to regitser the initial envorinment +Rem Run bash to register the initial environment echo "Setting up MSYS system ..." "%MSYSDIR%\bin\bash.exe" --login -c echo echo "Updating fc-cache (may take a while) ..."
--- a/src/arpack-1-gcc10.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4438 +0,0 @@ -From 9418632214acf6d387896ab29a8f5bdff2d4e38a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Schw=C3=B6rer?= <davidsch@fedoraproject.org> -Date: Wed, 19 Feb 2020 20:07:47 +0000 -Subject: [PATCH] ?vout expects a vector, so make sure to pass a vector - -gcc10 throws an error otherwise - -diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f -index 322b35c7..a91ef926 100644 ---- a/SRC/cgetv0.f -+++ b/SRC/cgetv0.f -@@ -361,9 +361,9 @@ subroutine cgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm0, ndigit, -+ call svout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -394,7 +394,7 @@ subroutine cgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/SRC/cnaitr.f b/SRC/cnaitr.f -index 2bb93fff..bebd8236 100644 ---- a/SRC/cnaitr.f -+++ b/SRC/cnaitr.f -@@ -378,9 +378,9 @@ subroutine cnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -400,7 +400,7 @@ subroutine cnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -729,7 +729,7 @@ subroutine cnaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm -diff --git a/SRC/cnapps.f b/SRC/cnapps.f -index fdf878d8..c3a55623 100644 ---- a/SRC/cnapps.f -+++ b/SRC/cnapps.f -@@ -268,9 +268,9 @@ subroutine cnapps - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call cvout (logfil, 1, sigma, ndigit, -+ call cvout (logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -291,9 +291,9 @@ subroutine cnapps - if ( abs(real(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call cvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -307,9 +307,9 @@ subroutine cnapps - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -485,7 +485,7 @@ subroutine cnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call cvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call cmout (logfil, kev, kev, h, ldh, ndigit, -diff --git a/SRC/cnaup2.f b/SRC/cnaup2.f -index e528a890..3f106f05 100644 ---- a/SRC/cnaup2.f -+++ b/SRC/cnaup2.f -@@ -389,7 +389,7 @@ subroutine cnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -402,9 +402,9 @@ subroutine cnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -430,7 +430,7 @@ subroutine cnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -658,7 +658,7 @@ subroutine cnaup2 - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -698,7 +698,7 @@ subroutine cnaup2 - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call cvout (logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -762,7 +762,7 @@ subroutine cnaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call cmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/SRC/cnaupd.f b/SRC/cnaupd.f -index 7bf37fd1..57be328b 100644 ---- a/SRC/cnaupd.f -+++ b/SRC/cnaupd.f -@@ -601,9 +601,9 @@ subroutine cnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call cvout (logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') -diff --git a/SRC/cneupd.f b/SRC/cneupd.f -index c557fa08..34a78f70 100644 ---- a/SRC/cneupd.f -+++ b/SRC/cneupd.f -@@ -536,9 +536,9 @@ subroutine cneupd(rvec , howmny, select, d , - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/SRC/cngets.f b/SRC/cngets.f -index 7686e133..20626a2d 100644 ---- a/SRC/cngets.f -+++ b/SRC/cngets.f -@@ -161,8 +161,8 @@ subroutine cngets ( ishift, which, kev, np, ritz, bounds) - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call cvout (logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call cvout (logfil, kev+np, bounds, ndigit, -diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f -index fbb4fe2a..1d6dc01b 100644 ---- a/SRC/dgetv0.f -+++ b/SRC/dgetv0.f -@@ -366,9 +366,9 @@ subroutine dgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm0, ndigit, -+ call dvout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -399,7 +399,7 @@ subroutine dgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 3) then -diff --git a/SRC/dnaitr.f b/SRC/dnaitr.f -index baaec038..c02cd390 100644 ---- a/SRC/dnaitr.f -+++ b/SRC/dnaitr.f -@@ -371,9 +371,9 @@ subroutine dnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -393,7 +393,7 @@ subroutine dnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -721,7 +721,7 @@ subroutine dnaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/SRC/dnapps.f b/SRC/dnapps.f -index 872d35ae..7fb37d87 100644 ---- a/SRC/dnapps.f -+++ b/SRC/dnapps.f -@@ -266,11 +266,11 @@ subroutine dnapps - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call dvout (logfil, 1, sigmar, ndigit, -+ call dvout (logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call dvout (logfil, 1, sigmai, ndigit, -+ call dvout (logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -335,9 +335,9 @@ subroutine dnapps - & tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call dvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -351,9 +351,9 @@ subroutine dnapps - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -627,7 +627,7 @@ subroutine dnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call dvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call dmout (logfil, kev, kev, h, ldh, ndigit, -diff --git a/SRC/dnaup2.f b/SRC/dnaup2.f -index 4c9948d4..18ad20a0 100644 ---- a/SRC/dnaup2.f -+++ b/SRC/dnaup2.f -@@ -388,7 +388,7 @@ subroutine dnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -401,9 +401,9 @@ subroutine dnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -435,7 +435,7 @@ subroutine dnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -689,7 +689,7 @@ subroutine dnaup2 - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -741,7 +741,7 @@ subroutine dnaup2 - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call dvout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -807,7 +807,7 @@ subroutine dnaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call dmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/SRC/dnaupd.f b/SRC/dnaupd.f -index 51d3018e..dcf1f77a 100644 ---- a/SRC/dnaupd.f -+++ b/SRC/dnaupd.f -@@ -628,9 +628,9 @@ subroutine dnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call dvout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') -diff --git a/SRC/dneupd.f b/SRC/dneupd.f -index 424ad2bf..9c2ece0e 100644 ---- a/SRC/dneupd.f -+++ b/SRC/dneupd.f -@@ -601,9 +601,9 @@ subroutine dneupd (rvec , howmny, select, dr , di, - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/SRC/dngets.f b/SRC/dngets.f -index a3145506..47d3ac2c 100644 ---- a/SRC/dngets.f -+++ b/SRC/dngets.f -@@ -212,8 +212,8 @@ subroutine dngets ( ishift, which, kev, np, ritzr, ritzi, bounds, - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call dvout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call dvout (logfil, kev+np, ritzi, ndigit, -diff --git a/SRC/dsaitr.f b/SRC/dsaitr.f -index 00dabfd2..3460d990 100644 ---- a/SRC/dsaitr.f -+++ b/SRC/dsaitr.f -@@ -364,9 +364,9 @@ subroutine dsaitr - 1000 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -384,7 +384,7 @@ subroutine dsaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -735,7 +735,7 @@ subroutine dsaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/SRC/dsapps.f b/SRC/dsapps.f -index 12108d0f..f84ef838 100644 ---- a/SRC/dsapps.f -+++ b/SRC/dsapps.f -@@ -261,9 +261,9 @@ subroutine dsapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call dvout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -432,7 +432,7 @@ subroutine dsapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call dvout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -diff --git a/SRC/dsaup2.f b/SRC/dsaup2.f -index f4c5f90c..f7d4a119 100644 ---- a/SRC/dsaup2.f -+++ b/SRC/dsaup2.f -@@ -402,13 +402,13 @@ subroutine dsaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -446,7 +446,7 @@ subroutine dsaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -695,7 +695,7 @@ subroutine dsaup2 - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -743,7 +743,7 @@ subroutine dsaup2 - if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call dvout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -810,7 +810,7 @@ subroutine dsaup2 - 130 continue - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call dvout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') -diff --git a/SRC/dsaupd.f b/SRC/dsaupd.f -index bd4afc26..c5b08d6b 100644 ---- a/SRC/dsaupd.f -+++ b/SRC/dsaupd.f -@@ -628,9 +628,9 @@ subroutine dsaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call dvout (logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') -diff --git a/SRC/dseupd.f b/SRC/dseupd.f -index e89fdccf..ae123a20 100644 ---- a/SRC/dseupd.f -+++ b/SRC/dseupd.f -@@ -513,9 +513,9 @@ subroutine dseupd (rvec , howmny, select, d , - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_seupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if - c -diff --git a/SRC/dsgets.f b/SRC/dsgets.f -index 800a02f4..436a4fe8 100644 ---- a/SRC/dsgets.f -+++ b/SRC/dsgets.f -@@ -202,8 +202,8 @@ subroutine dsgets ( ishift, which, kev, np, ritz, bounds, shifts ) - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_sgets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_sgets: NP is') - call dvout (logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call dvout (logfil, kev+np, bounds, ndigit, -diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f -index c768daae..d861b2d6 100644 ---- a/SRC/sgetv0.f -+++ b/SRC/sgetv0.f -@@ -366,9 +366,9 @@ subroutine sgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm0, ndigit, -+ call svout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -399,7 +399,7 @@ subroutine sgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 3) then -diff --git a/SRC/snaitr.f b/SRC/snaitr.f -index 5ecdebb7..8a5d795b 100644 ---- a/SRC/snaitr.f -+++ b/SRC/snaitr.f -@@ -371,9 +371,9 @@ subroutine snaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -393,7 +393,7 @@ subroutine snaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -721,7 +721,7 @@ subroutine snaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/SRC/snapps.f b/SRC/snapps.f -index 914c9b8b..9b767285 100644 ---- a/SRC/snapps.f -+++ b/SRC/snapps.f -@@ -266,11 +266,11 @@ subroutine snapps - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call svout (logfil, 1, sigmar, ndigit, -+ call svout (logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call svout (logfil, 1, sigmai, ndigit, -+ call svout (logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -335,9 +335,9 @@ subroutine snapps - & tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call svout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -351,9 +351,9 @@ subroutine snapps - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -625,7 +625,7 @@ subroutine snapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call svout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call smout (logfil, kev, kev, h, ldh, ndigit, -diff --git a/SRC/snaup2.f b/SRC/snaup2.f -index 53e39461..12b2cfed 100644 ---- a/SRC/snaup2.f -+++ b/SRC/snaup2.f -@@ -388,7 +388,7 @@ subroutine snaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -401,9 +401,9 @@ subroutine snaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -435,7 +435,7 @@ subroutine snaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -690,7 +690,7 @@ subroutine snaup2 - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -742,7 +742,7 @@ subroutine snaup2 - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call svout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -808,7 +808,7 @@ subroutine snaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call smout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/SRC/snaupd.f b/SRC/snaupd.f -index 19284d06..e0be1bfd 100644 ---- a/SRC/snaupd.f -+++ b/SRC/snaupd.f -@@ -628,9 +628,9 @@ subroutine snaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call svout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') -diff --git a/SRC/sneupd.f b/SRC/sneupd.f -index ecd8f164..4c472fef 100644 ---- a/SRC/sneupd.f -+++ b/SRC/sneupd.f -@@ -601,9 +601,9 @@ subroutine sneupd(rvec , howmny, select, dr , di, - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/SRC/sngets.f b/SRC/sngets.f -index 800282f8..7e48c0bb 100644 ---- a/SRC/sngets.f -+++ b/SRC/sngets.f -@@ -212,8 +212,8 @@ subroutine sngets ( ishift, which, kev, np, ritzr, ritzi, bounds, - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call svout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call svout (logfil, kev+np, ritzi, ndigit, -diff --git a/SRC/ssaitr.f b/SRC/ssaitr.f -index 721bdb58..a5df2c2e 100644 ---- a/SRC/ssaitr.f -+++ b/SRC/ssaitr.f -@@ -364,9 +364,9 @@ subroutine ssaitr - 1000 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -384,7 +384,7 @@ subroutine ssaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -735,7 +735,7 @@ subroutine ssaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/SRC/ssapps.f b/SRC/ssapps.f -index c8143111..77bd9d52 100644 ---- a/SRC/ssapps.f -+++ b/SRC/ssapps.f -@@ -261,9 +261,9 @@ subroutine ssapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call svout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -432,7 +432,7 @@ subroutine ssapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call svout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -diff --git a/SRC/ssaup2.f b/SRC/ssaup2.f -index a73c9a58..8cc04638 100644 ---- a/SRC/ssaup2.f -+++ b/SRC/ssaup2.f -@@ -402,13 +402,13 @@ subroutine ssaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -446,7 +446,7 @@ subroutine ssaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -694,7 +694,7 @@ subroutine ssaup2 - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -742,7 +742,7 @@ subroutine ssaup2 - if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call svout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -809,7 +809,7 @@ subroutine ssaup2 - 130 continue - c - if (msglvl .gt. 2) then -- call svout (logfil, 1, rnorm, ndigit, -+ call svout (logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call svout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') -diff --git a/SRC/ssaupd.f b/SRC/ssaupd.f -index d139ac53..a8d2f2d5 100644 ---- a/SRC/ssaupd.f -+++ b/SRC/ssaupd.f -@@ -628,9 +628,9 @@ subroutine ssaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call svout (logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') -diff --git a/SRC/sseupd.f b/SRC/sseupd.f -index 9b94ed7c..03ba7ac5 100644 ---- a/SRC/sseupd.f -+++ b/SRC/sseupd.f -@@ -513,9 +513,9 @@ subroutine sseupd(rvec , howmny, select, d , - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_seupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if - c -diff --git a/SRC/ssgets.f b/SRC/ssgets.f -index ce84d673..f40ca76a 100644 ---- a/SRC/ssgets.f -+++ b/SRC/ssgets.f -@@ -202,8 +202,8 @@ subroutine ssgets ( ishift, which, kev, np, ritz, bounds, shifts ) - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_sgets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_sgets: NP is') - call svout (logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call svout (logfil, kev+np, bounds, ndigit, -diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f -index d71f3c03..ff5c2b19 100644 ---- a/SRC/zgetv0.f -+++ b/SRC/zgetv0.f -@@ -361,9 +361,9 @@ subroutine zgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm0, ndigit, -+ call dvout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -394,7 +394,7 @@ subroutine zgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/SRC/znaitr.f b/SRC/znaitr.f -index b8331c06..1c5aa57f 100644 ---- a/SRC/znaitr.f -+++ b/SRC/znaitr.f -@@ -378,9 +378,9 @@ subroutine znaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -400,7 +400,7 @@ subroutine znaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -729,7 +729,7 @@ subroutine znaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call ivout (logfil, 1, j, ndigit, -+ call ivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm -diff --git a/SRC/znapps.f b/SRC/znapps.f -index a1f116d3..6d8d12a8 100644 ---- a/SRC/znapps.f -+++ b/SRC/znapps.f -@@ -268,9 +268,9 @@ subroutine znapps - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call zvout (logfil, 1, sigma, ndigit, -+ call zvout (logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -291,9 +291,9 @@ subroutine znapps - if ( abs(dble(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call ivout (logfil, 1, i, ndigit, -+ call ivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call ivout (logfil, 1, jj, ndigit, -+ call ivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call zvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -307,9 +307,9 @@ subroutine znapps - 40 continue - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, istart, ndigit, -+ call ivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call ivout (logfil, 1, iend, ndigit, -+ call ivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -485,7 +485,7 @@ subroutine znapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call zvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call ivout (logfil, 1, kev, ndigit, -+ call ivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call zmout (logfil, kev, kev, h, ldh, ndigit, -diff --git a/SRC/znaup2.f b/SRC/znaup2.f -index 469aafb2..b814cf15 100644 ---- a/SRC/znaup2.f -+++ b/SRC/znaup2.f -@@ -389,7 +389,7 @@ subroutine znaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, iter, ndigit, -+ call ivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -402,9 +402,9 @@ subroutine znaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call ivout (logfil, 1, nev, ndigit, -+ call ivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -430,7 +430,7 @@ subroutine znaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -658,7 +658,7 @@ subroutine znaup2 - end if - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, nconv, ndigit, -+ call ivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -698,7 +698,7 @@ subroutine znaup2 - end if - c - if (msglvl .gt. 2) then -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call zvout (logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -762,7 +762,7 @@ subroutine znaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call dvout (logfil, 1, rnorm, ndigit, -+ call dvout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call zmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/SRC/znaupd.f b/SRC/znaupd.f -index 779eb2bc..c7d58aaa 100644 ---- a/SRC/znaupd.f -+++ b/SRC/znaupd.f -@@ -601,9 +601,9 @@ subroutine znaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, mxiter, ndigit, -+ call ivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call ivout (logfil, 1, np, ndigit, -+ call ivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call zvout (logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') -diff --git a/SRC/zneupd.f b/SRC/zneupd.f -index f1eb68a3..9889e30e 100644 ---- a/SRC/zneupd.f -+++ b/SRC/zneupd.f -@@ -536,9 +536,9 @@ subroutine zneupd(rvec , howmny, select, d , - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call ivout(logfil, 1, numcnv, ndigit, -+ call ivout(logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call ivout(logfil, 1, nconv, ndigit, -+ call ivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/SRC/zngets.f b/SRC/zngets.f -index 27f25803..e7d24334 100644 ---- a/SRC/zngets.f -+++ b/SRC/zngets.f -@@ -161,8 +161,8 @@ subroutine zngets ( ishift, which, kev, np, ritz, bounds) - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call ivout (logfil, 1, np, ndigit, '_ngets: NP is') -+ call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call zvout (logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call zvout (logfil, kev+np, bounds, ndigit, - - -From ad82dcbc0beeed5616e2d5a28a089d9785f8b8b8 Mon Sep 17 00:00:00 2001 -From: dschwoerer <dschwoerer@users.noreply.github.com> -Date: Mon, 24 Feb 2020 09:05:43 +0000 -Subject: [PATCH] gcc-10 (parpack) and mpich (#245) - -* port PARPACK also to gcc 10 - -* Ensure that the output buffer is a rank-1 vector - -The vector should also not be a temporary, so that we -can use the result. - -* use valid address of binary - -openmpi ignores this error, but mpich doesn't - -* Add travis test with gcc 10 and mpich - -* After pulling fedora:rawhide, use fedora:rawhide - -* simplify travis tests for fedora - -* run using bash -v (permissions issue otherwise) - -* run using bash -v (permissions issue otherwise) - -* fix permission of script - -* Add she-bang to allow execution - -* fix test for fedora - -Co-authored-by: Sylvestre Ledru <sledru@mozilla.com> - -diff --git a/PARPACK/SRC/BLACS/pcgetv0.f b/PARPACK/SRC/BLACS/pcgetv0.f -index 0325fda3..191d70fd 100644 ---- a/PARPACK/SRC/BLACS/pcgetv0.f -+++ b/PARPACK/SRC/BLACS/pcgetv0.f -@@ -406,9 +406,9 @@ subroutine pcgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm0, ndigit, -+ call psvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -diff --git a/PARPACK/SRC/BLACS/pcnaitr.f b/PARPACK/SRC/BLACS/pcnaitr.f -index a9f17ed8..04fa1cbe 100644 ---- a/PARPACK/SRC/BLACS/pcnaitr.f -+++ b/PARPACK/SRC/BLACS/pcnaitr.f -@@ -401,9 +401,9 @@ subroutine pcnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call pcvout (comm, logfil, 1, rnorm, ndigit, -+ call pcvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -423,7 +423,7 @@ subroutine pcnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -757,7 +757,7 @@ subroutine pcnaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm -diff --git a/PARPACK/SRC/BLACS/pcnapps.f b/PARPACK/SRC/BLACS/pcnapps.f -index 47fb7e70..e40793cf 100644 ---- a/PARPACK/SRC/BLACS/pcnapps.f -+++ b/PARPACK/SRC/BLACS/pcnapps.f -@@ -284,9 +284,9 @@ subroutine pcnapps - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call pcvout (comm, logfil, 1, sigma, ndigit, -+ call pcvout (comm, logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -307,9 +307,9 @@ subroutine pcnapps - if ( abs(real(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call pcvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -323,9 +323,9 @@ subroutine pcnapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -501,7 +501,7 @@ subroutine pcnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call pcvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call pcmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/BLACS/pcnaup2.f b/PARPACK/SRC/BLACS/pcnaup2.f -index 55868069..757b12c3 100644 ---- a/PARPACK/SRC/BLACS/pcnaup2.f -+++ b/PARPACK/SRC/BLACS/pcnaup2.f -@@ -398,7 +398,7 @@ subroutine pcnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -411,9 +411,9 @@ subroutine pcnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -440,7 +440,7 @@ subroutine pcnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -671,7 +671,7 @@ subroutine pcnaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -711,7 +711,7 @@ subroutine pcnaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call pcvout (comm, logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -776,7 +776,7 @@ subroutine pcnaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call pcmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/BLACS/pcnaupd.f b/PARPACK/SRC/BLACS/pcnaupd.f -index b350199e..55bb655d 100644 ---- a/PARPACK/SRC/BLACS/pcnaupd.f -+++ b/PARPACK/SRC/BLACS/pcnaupd.f -@@ -618,9 +618,9 @@ subroutine pcnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call pcvout (comm, logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') -diff --git a/PARPACK/SRC/BLACS/pcneupd.f b/PARPACK/SRC/BLACS/pcneupd.f -index 53cf2d24..da4a9ec5 100644 ---- a/PARPACK/SRC/BLACS/pcneupd.f -+++ b/PARPACK/SRC/BLACS/pcneupd.f -@@ -558,9 +558,9 @@ subroutine pcneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/BLACS/pcngets.f b/PARPACK/SRC/BLACS/pcngets.f -index f9cca353..89cd67ae 100644 ---- a/PARPACK/SRC/BLACS/pcngets.f -+++ b/PARPACK/SRC/BLACS/pcngets.f -@@ -177,8 +177,8 @@ subroutine pcngets ( comm, ishift, which, kev, np, ritz, bounds) - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call pcvout (comm, logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call pcvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/BLACS/pdgetv0.f b/PARPACK/SRC/BLACS/pdgetv0.f -index 9c3a1d99..237443dd 100644 ---- a/PARPACK/SRC/BLACS/pdgetv0.f -+++ b/PARPACK/SRC/BLACS/pdgetv0.f -@@ -385,9 +385,9 @@ subroutine pdgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm0, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -418,7 +418,7 @@ subroutine pdgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/BLACS/pdnaitr.f b/PARPACK/SRC/BLACS/pdnaitr.f -index f6557560..fb46494f 100644 ---- a/PARPACK/SRC/BLACS/pdnaitr.f -+++ b/PARPACK/SRC/BLACS/pdnaitr.f -@@ -390,9 +390,9 @@ subroutine pdnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -412,7 +412,7 @@ subroutine pdnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -745,7 +745,7 @@ subroutine pdnaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/BLACS/pdnapps.f b/PARPACK/SRC/BLACS/pdnapps.f -index 56e3414d..eadca320 100644 ---- a/PARPACK/SRC/BLACS/pdnapps.f -+++ b/PARPACK/SRC/BLACS/pdnapps.f -@@ -276,11 +276,11 @@ subroutine pdnapps - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call pdvout (comm, logfil, 1, sigmar, ndigit, -+ call pdvout (comm, logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call pdvout (comm, logfil, 1, sigmai, ndigit, -+ call pdvout (comm, logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -347,7 +347,7 @@ subroutine pdnapps - if (msglvl .gt. 0) then - call pivout (comm, logfil, 1, i, ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call pdvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -361,9 +361,9 @@ subroutine pdnapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -635,7 +635,7 @@ subroutine pdnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call pdvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call pdmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/BLACS/pdnaup2.f b/PARPACK/SRC/BLACS/pdnaup2.f -index becea72d..a295dbbb 100644 ---- a/PARPACK/SRC/BLACS/pdnaup2.f -+++ b/PARPACK/SRC/BLACS/pdnaup2.f -@@ -405,7 +405,7 @@ subroutine pdnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -418,9 +418,9 @@ subroutine pdnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -452,7 +452,7 @@ subroutine pdnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -696,7 +696,7 @@ subroutine pdnaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -748,7 +748,7 @@ subroutine pdnaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call pdvout (comm, logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -815,7 +815,7 @@ subroutine pdnaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call pdmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/BLACS/pdnaupd.f b/PARPACK/SRC/BLACS/pdnaupd.f -index d947755b..ed0fa20f 100644 ---- a/PARPACK/SRC/BLACS/pdnaupd.f -+++ b/PARPACK/SRC/BLACS/pdnaupd.f -@@ -642,9 +642,9 @@ subroutine pdnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call pdvout (comm, logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') -diff --git a/PARPACK/SRC/BLACS/pdneupd.f b/PARPACK/SRC/BLACS/pdneupd.f -index 0ff911ff..321202f9 100644 ---- a/PARPACK/SRC/BLACS/pdneupd.f -+++ b/PARPACK/SRC/BLACS/pdneupd.f -@@ -617,9 +617,9 @@ subroutine pdneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/BLACS/pdngets.f b/PARPACK/SRC/BLACS/pdngets.f -index 71ed6a7c..12a691f6 100644 ---- a/PARPACK/SRC/BLACS/pdngets.f -+++ b/PARPACK/SRC/BLACS/pdngets.f -@@ -226,8 +226,8 @@ subroutine pdngets - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call pdvout (comm, logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call pdvout (comm, logfil, kev+np, ritzi, ndigit, -diff --git a/PARPACK/SRC/BLACS/pdsaitr.f b/PARPACK/SRC/BLACS/pdsaitr.f -index 37ca61e8..9a2cdfc1 100644 ---- a/PARPACK/SRC/BLACS/pdsaitr.f -+++ b/PARPACK/SRC/BLACS/pdsaitr.f -@@ -389,9 +389,9 @@ subroutine pdsaitr - 1000 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -409,7 +409,7 @@ subroutine pdsaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -767,7 +767,7 @@ subroutine pdsaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/BLACS/pdsapps.f b/PARPACK/SRC/BLACS/pdsapps.f -index b3a05cf4..4e2c0760 100644 ---- a/PARPACK/SRC/BLACS/pdsapps.f -+++ b/PARPACK/SRC/BLACS/pdsapps.f -@@ -272,9 +272,9 @@ subroutine pdsapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call pdvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -443,7 +443,7 @@ subroutine pdsapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call pdvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -diff --git a/PARPACK/SRC/BLACS/pdsaup2.f b/PARPACK/SRC/BLACS/pdsaup2.f -index cf934016..599aad62 100644 ---- a/PARPACK/SRC/BLACS/pdsaup2.f -+++ b/PARPACK/SRC/BLACS/pdsaup2.f -@@ -421,13 +421,13 @@ subroutine pdsaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -466,7 +466,7 @@ subroutine pdsaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -716,7 +716,7 @@ subroutine pdsaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -763,7 +763,7 @@ subroutine pdsaup2 - if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call pdvout (comm, logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -831,7 +831,7 @@ subroutine pdsaup2 - 130 continue - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call pdvout (comm, logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') -diff --git a/PARPACK/SRC/BLACS/pdsaupd.f b/PARPACK/SRC/BLACS/pdsaupd.f -index 5f606d59..cb021128 100644 ---- a/PARPACK/SRC/BLACS/pdsaupd.f -+++ b/PARPACK/SRC/BLACS/pdsaupd.f -@@ -644,9 +644,9 @@ subroutine pdsaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call pdvout (comm, logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') -diff --git a/PARPACK/SRC/BLACS/pdseupd.f b/PARPACK/SRC/BLACS/pdseupd.f -index 956891cd..074b195b 100644 ---- a/PARPACK/SRC/BLACS/pdseupd.f -+++ b/PARPACK/SRC/BLACS/pdseupd.f -@@ -523,9 +523,9 @@ subroutine pdseupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/BLACS/pdsgets.f b/PARPACK/SRC/BLACS/pdsgets.f -index aa549a25..d0f703bb 100644 ---- a/PARPACK/SRC/BLACS/pdsgets.f -+++ b/PARPACK/SRC/BLACS/pdsgets.f -@@ -216,8 +216,8 @@ subroutine pdsgets - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_sgets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_sgets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_sgets: NP is') - call pdvout (comm, logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call pdvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/BLACS/psgetv0.f b/PARPACK/SRC/BLACS/psgetv0.f -index 9862d055..d48cb6db 100644 ---- a/PARPACK/SRC/BLACS/psgetv0.f -+++ b/PARPACK/SRC/BLACS/psgetv0.f -@@ -385,9 +385,9 @@ subroutine psgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm0, ndigit, -+ call psvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -418,7 +418,7 @@ subroutine psgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/BLACS/psnaitr.f b/PARPACK/SRC/BLACS/psnaitr.f -index 07aa0526..bbd2809c 100644 ---- a/PARPACK/SRC/BLACS/psnaitr.f -+++ b/PARPACK/SRC/BLACS/psnaitr.f -@@ -390,9 +390,9 @@ subroutine psnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -412,7 +412,7 @@ subroutine psnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -745,7 +745,7 @@ subroutine psnaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/BLACS/psnapps.f b/PARPACK/SRC/BLACS/psnapps.f -index a515d0cd..ba668bba 100644 ---- a/PARPACK/SRC/BLACS/psnapps.f -+++ b/PARPACK/SRC/BLACS/psnapps.f -@@ -276,11 +276,11 @@ subroutine psnapps - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call psvout (comm, logfil, 1, sigmar, ndigit, -+ call psvout (comm, logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call psvout (comm, logfil, 1, sigmai, ndigit, -+ call psvout (comm, logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -347,7 +347,7 @@ subroutine psnapps - if (msglvl .gt. 0) then - call pivout (comm, logfil, 1, i, ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call psvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -361,9 +361,9 @@ subroutine psnapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -635,7 +635,7 @@ subroutine psnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call psvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call psmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/BLACS/psnaup2.f b/PARPACK/SRC/BLACS/psnaup2.f -index eff2a136..e4603273 100644 ---- a/PARPACK/SRC/BLACS/psnaup2.f -+++ b/PARPACK/SRC/BLACS/psnaup2.f -@@ -405,7 +405,7 @@ subroutine psnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -418,9 +418,9 @@ subroutine psnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -452,7 +452,7 @@ subroutine psnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -696,7 +696,7 @@ subroutine psnaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -748,7 +748,7 @@ subroutine psnaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call psvout (comm, logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -815,7 +815,7 @@ subroutine psnaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call psmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/BLACS/psnaupd.f b/PARPACK/SRC/BLACS/psnaupd.f -index 55f34ce6..4f2484f9 100644 ---- a/PARPACK/SRC/BLACS/psnaupd.f -+++ b/PARPACK/SRC/BLACS/psnaupd.f -@@ -642,9 +642,9 @@ subroutine psnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call psvout (comm, logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') -diff --git a/PARPACK/SRC/BLACS/psneupd.f b/PARPACK/SRC/BLACS/psneupd.f -index 49847ffe..cbdaba28 100644 ---- a/PARPACK/SRC/BLACS/psneupd.f -+++ b/PARPACK/SRC/BLACS/psneupd.f -@@ -617,9 +617,9 @@ subroutine psneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/BLACS/psngets.f b/PARPACK/SRC/BLACS/psngets.f -index c0e30886..33d85dfe 100644 ---- a/PARPACK/SRC/BLACS/psngets.f -+++ b/PARPACK/SRC/BLACS/psngets.f -@@ -226,8 +226,8 @@ subroutine psngets - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call psvout (comm, logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call psvout (comm, logfil, kev+np, ritzi, ndigit, -diff --git a/PARPACK/SRC/BLACS/pssaitr.f b/PARPACK/SRC/BLACS/pssaitr.f -index 50816c4f..e57864a5 100644 ---- a/PARPACK/SRC/BLACS/pssaitr.f -+++ b/PARPACK/SRC/BLACS/pssaitr.f -@@ -389,9 +389,9 @@ subroutine pssaitr - 1000 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -409,7 +409,7 @@ subroutine pssaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -767,7 +767,7 @@ subroutine pssaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/BLACS/pssapps.f b/PARPACK/SRC/BLACS/pssapps.f -index 7c8465b3..5198a734 100644 ---- a/PARPACK/SRC/BLACS/pssapps.f -+++ b/PARPACK/SRC/BLACS/pssapps.f -@@ -272,9 +272,9 @@ subroutine pssapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call psvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -443,7 +443,7 @@ subroutine pssapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call psvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -diff --git a/PARPACK/SRC/BLACS/pssaup2.f b/PARPACK/SRC/BLACS/pssaup2.f -index 57ab391b..87cc3a81 100644 ---- a/PARPACK/SRC/BLACS/pssaup2.f -+++ b/PARPACK/SRC/BLACS/pssaup2.f -@@ -421,13 +421,13 @@ subroutine pssaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -466,7 +466,7 @@ subroutine pssaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -716,7 +716,7 @@ subroutine pssaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -763,7 +763,7 @@ subroutine pssaup2 - if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call psvout (comm, logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -831,7 +831,7 @@ subroutine pssaup2 - 130 continue - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call psvout (comm, logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') -diff --git a/PARPACK/SRC/BLACS/pssaupd.f b/PARPACK/SRC/BLACS/pssaupd.f -index 1b276e86..9d6061c1 100644 ---- a/PARPACK/SRC/BLACS/pssaupd.f -+++ b/PARPACK/SRC/BLACS/pssaupd.f -@@ -644,9 +644,9 @@ subroutine pssaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call psvout (comm, logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') -diff --git a/PARPACK/SRC/BLACS/psseupd.f b/PARPACK/SRC/BLACS/psseupd.f -index 68edab15..e8c910e8 100644 ---- a/PARPACK/SRC/BLACS/psseupd.f -+++ b/PARPACK/SRC/BLACS/psseupd.f -@@ -523,9 +523,9 @@ subroutine psseupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/BLACS/pssgets.f b/PARPACK/SRC/BLACS/pssgets.f -index d138282a..660c274f 100644 ---- a/PARPACK/SRC/BLACS/pssgets.f -+++ b/PARPACK/SRC/BLACS/pssgets.f -@@ -216,8 +216,8 @@ subroutine pssgets - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_sgets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_sgets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_sgets: NP is') - call psvout (comm, logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call psvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/BLACS/pzgetv0.f b/PARPACK/SRC/BLACS/pzgetv0.f -index 09723313..c1d173f0 100644 ---- a/PARPACK/SRC/BLACS/pzgetv0.f -+++ b/PARPACK/SRC/BLACS/pzgetv0.f -@@ -406,9 +406,9 @@ subroutine pzgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm0, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -440,7 +440,7 @@ subroutine pzgetv0 - c - if (msglvl .gt. 0) then - cnorm2 = dcmplx (rnorm,rzero) -- call pzvout (comm, logfil, 1, cnorm2, ndigit, -+ call pzvout (comm, logfil, 1, [cnorm2], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/BLACS/pznaitr.f b/PARPACK/SRC/BLACS/pznaitr.f -index 61f467a2..92db7fe7 100644 ---- a/PARPACK/SRC/BLACS/pznaitr.f -+++ b/PARPACK/SRC/BLACS/pznaitr.f -@@ -401,9 +401,9 @@ subroutine pznaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call pzvout (comm, logfil, 1, rnorm, ndigit, -+ call pzvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -423,7 +423,7 @@ subroutine pznaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -757,7 +757,7 @@ subroutine pznaitr - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm -diff --git a/PARPACK/SRC/BLACS/pznapps.f b/PARPACK/SRC/BLACS/pznapps.f -index 796f4ded..155038d1 100644 ---- a/PARPACK/SRC/BLACS/pznapps.f -+++ b/PARPACK/SRC/BLACS/pznapps.f -@@ -284,9 +284,9 @@ subroutine pznapps - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call pzvout (comm, logfil, 1, sigma, ndigit, -+ call pzvout (comm, logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -307,9 +307,9 @@ subroutine pznapps - if ( abs(dble(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call pzvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -323,9 +323,9 @@ subroutine pznapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -501,7 +501,7 @@ subroutine pznapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call pzvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call pzmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/BLACS/pznaup2.f b/PARPACK/SRC/BLACS/pznaup2.f -index 22b46dd2..1610a588 100644 ---- a/PARPACK/SRC/BLACS/pznaup2.f -+++ b/PARPACK/SRC/BLACS/pznaup2.f -@@ -398,7 +398,7 @@ subroutine pznaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -411,9 +411,9 @@ subroutine pznaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -440,7 +440,7 @@ subroutine pznaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -671,7 +671,7 @@ subroutine pznaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -711,7 +711,7 @@ subroutine pznaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call pzvout (comm, logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -776,7 +776,7 @@ subroutine pznaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call pzmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/BLACS/pznaupd.f b/PARPACK/SRC/BLACS/pznaupd.f -index 0bf616f9..b46679a6 100644 ---- a/PARPACK/SRC/BLACS/pznaupd.f -+++ b/PARPACK/SRC/BLACS/pznaupd.f -@@ -618,9 +618,9 @@ subroutine pznaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call pzvout (comm, logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') -diff --git a/PARPACK/SRC/BLACS/pzneupd.f b/PARPACK/SRC/BLACS/pzneupd.f -index 1970e488..c2f508f2 100644 ---- a/PARPACK/SRC/BLACS/pzneupd.f -+++ b/PARPACK/SRC/BLACS/pzneupd.f -@@ -558,9 +558,9 @@ subroutine pzneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/BLACS/pzngets.f b/PARPACK/SRC/BLACS/pzngets.f -index 18e1518d..d880b4cc 100644 ---- a/PARPACK/SRC/BLACS/pzngets.f -+++ b/PARPACK/SRC/BLACS/pzngets.f -@@ -177,8 +177,8 @@ subroutine pzngets ( comm, ishift, which, kev, np, ritz, bounds) - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call pzvout (comm, logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call pzvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/MPI/pcgetv0.f b/PARPACK/SRC/MPI/pcgetv0.f -index aacfd046..72677a50 100644 ---- a/PARPACK/SRC/MPI/pcgetv0.f -+++ b/PARPACK/SRC/MPI/pcgetv0.f -@@ -185,7 +185,7 @@ subroutine pcgetv0 - save first, iseed, inits, iter, msglvl, orth, rnorm0 - c - Complex -- & cnorm_buf -+ & cnorm_buf, buf2(1) - c - c %----------------------% - c | External Subroutines | -@@ -332,8 +332,9 @@ subroutine pcgetv0 - first = .FALSE. - if (bmat .eq. 'G') then - cnorm_buf = cdotc (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_COMPLEX, MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm0 = sqrt(slapy2(real (cnorm),aimag(cnorm))) - else if (bmat .eq. 'I') then - rnorm0 = pscnorm2( comm, n, resid, 1) -@@ -393,8 +394,9 @@ subroutine pcgetv0 - c - if (bmat .eq. 'G') then - cnorm_buf = cdotc (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_COMPLEX, MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm = sqrt(slapy2(real (cnorm),aimag(cnorm))) - else if (bmat .eq. 'I') then - rnorm = pscnorm2(comm, n, resid, 1) -@@ -405,9 +407,9 @@ subroutine pcgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm0, ndigit, -+ call psvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -439,7 +441,7 @@ subroutine pcgetv0 - c - if (msglvl .gt. 0) then - cnorm2 = cmplx(rnorm,rzero) -- call pcvout (comm, logfil, 1, cnorm2, ndigit, -+ call pcvout (comm, logfil, 1, [cnorm2], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/MPI/pcnaitr.f b/PARPACK/SRC/MPI/pcnaitr.f -index 4a27960a..fe246ea0 100644 ---- a/PARPACK/SRC/MPI/pcnaitr.f -+++ b/PARPACK/SRC/MPI/pcnaitr.f -@@ -293,7 +293,7 @@ subroutine pcnaitr - & betaj, rnorm1, smlnum, ulp, unfl, wnorm - c - Complex -- & cnorm_buf -+ & cnorm_buf, buf2(1) - c - c %----------------------% - c | External Subroutines | -@@ -404,9 +404,9 @@ subroutine pcnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call pcvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -426,7 +426,7 @@ subroutine pcnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -577,8 +577,9 @@ subroutine pcnaitr - c - if (bmat .eq. 'G') then - cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_COMPLEX, MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - wnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) ) - else if (bmat .eq. 'I') then - wnorm = pscnorm2(comm, n, resid, 1) -@@ -653,8 +654,9 @@ subroutine pcnaitr - c - if (bmat .eq. 'G') then - cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_COMPLEX, MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm = pscnorm2(comm, n, resid, 1) -@@ -757,15 +759,16 @@ subroutine pcnaitr - c - if (bmat .eq. 'G') then - cnorm_buf = cdotc (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_COMPLEX, MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm1 = sqrt( slapy2(real(cnorm),aimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm1 = pscnorm2(comm, n, resid, 1) - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm -diff --git a/PARPACK/SRC/MPI/pcnapps.f b/PARPACK/SRC/MPI/pcnapps.f -index 76077b92..f17686d8 100644 ---- a/PARPACK/SRC/MPI/pcnapps.f -+++ b/PARPACK/SRC/MPI/pcnapps.f -@@ -283,9 +283,9 @@ subroutine pcnapps - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call pcvout (comm, logfil, 1, sigma, ndigit, -+ call pcvout (comm, logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -306,9 +306,9 @@ subroutine pcnapps - if ( abs(real(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call pcvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -322,9 +322,9 @@ subroutine pcnapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -500,7 +500,7 @@ subroutine pcnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call pcvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call pcmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/MPI/pcnaup2.f b/PARPACK/SRC/MPI/pcnaup2.f -index 91fe9293..4b0d6ceb 100644 ---- a/PARPACK/SRC/MPI/pcnaup2.f -+++ b/PARPACK/SRC/MPI/pcnaup2.f -@@ -237,7 +237,7 @@ subroutine pcnaup2 - & nevbef, nev0 , np0, eps23 - c - Real -- & cmpnorm_buf -+ & cmpnorm_buf, buf2(1) - c - c %-----------------------% - c | Local array arguments | -@@ -401,7 +401,7 @@ subroutine pcnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -414,9 +414,9 @@ subroutine pcnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -443,7 +443,7 @@ subroutine pcnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -674,7 +674,7 @@ subroutine pcnaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -714,7 +714,7 @@ subroutine pcnaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call pcvout (comm, logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -771,8 +771,9 @@ subroutine pcnaup2 - c - if (bmat .eq. 'G') then - cmpnorm_buf = cdotc (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( cmpnorm_buf, cmpnorm, 1, -+ call MPI_ALLREDUCE( [cmpnorm_buf], buf2, 1, - & MPI_COMPLEX, MPI_SUM, comm, ierr ) -+ cmpnorm = buf2(1) - rnorm = sqrt(slapy2(real(cmpnorm),aimag(cmpnorm))) - else if (bmat .eq. 'I') then - rnorm = pscnorm2(comm, n, resid, 1) -@@ -780,7 +781,7 @@ subroutine pcnaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call pcmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/MPI/pcnaupd.f b/PARPACK/SRC/MPI/pcnaupd.f -index 5b8e1f5c..0bd6eb6c 100644 ---- a/PARPACK/SRC/MPI/pcnaupd.f -+++ b/PARPACK/SRC/MPI/pcnaupd.f -@@ -626,9 +626,9 @@ subroutine pcnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call pcvout (comm, logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') -diff --git a/PARPACK/SRC/MPI/pcneupd.f b/PARPACK/SRC/MPI/pcneupd.f -index 2566f8a5..8ced1df6 100644 ---- a/PARPACK/SRC/MPI/pcneupd.f -+++ b/PARPACK/SRC/MPI/pcneupd.f -@@ -558,9 +558,9 @@ subroutine pcneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/MPI/pcngets.f b/PARPACK/SRC/MPI/pcngets.f -index 34b9b047..5f672149 100644 ---- a/PARPACK/SRC/MPI/pcngets.f -+++ b/PARPACK/SRC/MPI/pcngets.f -@@ -177,8 +177,8 @@ subroutine pcngets ( comm, ishift, which, kev, np, ritz, bounds) - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call pcvout (comm, logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call pcvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/MPI/pdgetv0.f b/PARPACK/SRC/MPI/pdgetv0.f -index 3dc71c66..54ed850c 100644 ---- a/PARPACK/SRC/MPI/pdgetv0.f -+++ b/PARPACK/SRC/MPI/pdgetv0.f -@@ -180,7 +180,7 @@ subroutine pdgetv0 - logical first, inits, orth - integer idist, iseed(4), iter, msglvl, jj - Double precision -- & rnorm0 -+ & rnorm0, buf2(1) - save first, iseed, inits, iter, msglvl, orth, rnorm0 - c - Double precision -@@ -318,9 +318,9 @@ subroutine pdgetv0 - first = .FALSE. - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm0, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm0 = sqrt(abs(rnorm0)) -+ rnorm0 = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm0 = pdnorm2( comm, n, resid, 1 ) - end if -@@ -379,9 +379,9 @@ subroutine pdgetv0 - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = pdnorm2( comm, n, resid, 1 ) - end if -@@ -391,9 +391,9 @@ subroutine pdgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm0, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -424,7 +424,7 @@ subroutine pdgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/MPI/pdlamch10.f b/PARPACK/SRC/MPI/pdlamch10.f -index fabfcbd1..64cd6666 100644 ---- a/PARPACK/SRC/MPI/pdlamch10.f -+++ b/PARPACK/SRC/MPI/pdlamch10.f -@@ -57,7 +57,7 @@ DOUBLE PRECISION FUNCTION PDLAMCH10( ICTXT, CMACH ) - * - * .. Local Scalars .. - INTEGER IDUMM -- DOUBLE PRECISION TEMP, TEMP1 -+ DOUBLE PRECISION TEMP, TEMP1, buf2(1) - * .. - * .. External Subroutines .. - * EXTERNAL DGAMN2D, DGAMX2D -@@ -73,19 +73,20 @@ DOUBLE PRECISION FUNCTION PDLAMCH10( ICTXT, CMACH ) - * - IF( LSAME( CMACH, 'E' ).OR.LSAME( CMACH, 'S' ).OR. - $ LSAME( CMACH, 'M' ).OR.LSAME( CMACH, 'U' ) ) THEN -- CALL MPI_ALLREDUCE( TEMP1, TEMP, 1, MPI_DOUBLE_PRECISION, -+ CALL MPI_ALLREDUCE( [TEMP1], buf2, 1, MPI_DOUBLE_PRECISION, - $ MPI_MAX, ICTXT, IDUMM ) --* CALL DGAMX2D( ICTXT, 'All', ' ', 1, 1, TEMP, 1, IDUMM, -+* CALL DGAMX2D( ICTXT, 'All', ' ', 1, 1, buf2(1), 1, IDUMM, - * $ IDUMM, 1, -1, IDUMM ) - ELSE IF( LSAME( CMACH, 'L' ).OR.LSAME( CMACH, 'O' ) ) THEN -- CALL MPI_ALLREDUCE( TEMP1, TEMP, 1, MPI_DOUBLE_PRECISION, -+ CALL MPI_ALLREDUCE( [TEMP1], buf2, 1, MPI_DOUBLE_PRECISION, - $ MPI_MIN, ICTXT, IDUMM ) --* CALL DGAMN2D( ICTXT, 'All', ' ', 1, 1, TEMP, 1, IDUMM, -+* CALL DGAMN2D( ICTXT, 'All', ' ', 1, 1, buf2(1), 1, IDUMM, - * $ IDUMM, 1, -1, IDUMM ) - ELSE -- TEMP = TEMP1 -+ buf2(1) = TEMP1 - END IF - * -+ TEMP = buf2(1) - PDLAMCH10 = TEMP - * - * End of PDLAMCH10 -diff --git a/PARPACK/SRC/MPI/pdnaitr.f b/PARPACK/SRC/MPI/pdnaitr.f -index f531fe1e..3c71ff93 100644 ---- a/PARPACK/SRC/MPI/pdnaitr.f -+++ b/PARPACK/SRC/MPI/pdnaitr.f -@@ -276,7 +276,7 @@ subroutine pdnaitr - & betaj, rnorm1, smlnum, ulp, unfl, wnorm - c - Double precision -- & rnorm_buf -+ & rnorm_buf, buf2(1) - c - c - c %-----------------------% -@@ -393,9 +393,9 @@ subroutine pdnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -415,7 +415,7 @@ subroutine pdnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -566,9 +566,9 @@ subroutine pdnaitr - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, wnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- wnorm = sqrt(abs(wnorm)) -+ wnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - wnorm = pdnorm2( comm, n, resid, 1 ) - end if -@@ -642,9 +642,9 @@ subroutine pdnaitr - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = pdnorm2( comm, n, resid, 1 ) - end if -@@ -745,15 +745,15 @@ subroutine pdnaitr - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm1, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm1 = sqrt(abs(rnorm1)) -+ rnorm1 = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm1 = pdnorm2( comm, n, resid, 1 ) - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/MPI/pdnapps.f b/PARPACK/SRC/MPI/pdnapps.f -index fb6f153f..b6ac3502 100644 ---- a/PARPACK/SRC/MPI/pdnapps.f -+++ b/PARPACK/SRC/MPI/pdnapps.f -@@ -276,11 +276,11 @@ subroutine pdnapps - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call pdvout (comm, logfil, 1, sigmar, ndigit, -+ call pdvout (comm, logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call pdvout (comm, logfil, 1, sigmai, ndigit, -+ call pdvout (comm, logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -345,9 +345,9 @@ subroutine pdnapps - & tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call pdvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -361,9 +361,9 @@ subroutine pdnapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -635,7 +635,7 @@ subroutine pdnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call pdvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call pdmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/MPI/pdnaup2.f b/PARPACK/SRC/MPI/pdnaup2.f -index d0f73738..c265380a 100644 ---- a/PARPACK/SRC/MPI/pdnaup2.f -+++ b/PARPACK/SRC/MPI/pdnaup2.f -@@ -234,7 +234,7 @@ subroutine pdnaup2 - & nevbef, nev0 , np0 , nptemp, numcnv, - & j - Double precision -- & rnorm , temp , eps23 -+ & rnorm , temp , eps23, buf2(1) - save cnorm , getv0, initv , update, ushift, - & rnorm , iter , kplusp, msglvl, nconv, - & nevbef, nev0 , np0 , eps23 , numcnv -@@ -408,7 +408,7 @@ subroutine pdnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -421,9 +421,9 @@ subroutine pdnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -455,7 +455,7 @@ subroutine pdnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -699,7 +699,7 @@ subroutine pdnaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -751,7 +751,7 @@ subroutine pdnaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call pdvout (comm, logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -810,16 +810,16 @@ subroutine pdnaup2 - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION , MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = pdnorm2 ( comm, n, resid, 1 ) - end if - cnorm = .false. - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call pdmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/MPI/pdnaupd.f b/PARPACK/SRC/MPI/pdnaupd.f -index 1bf0fc12..231f9cab 100644 ---- a/PARPACK/SRC/MPI/pdnaupd.f -+++ b/PARPACK/SRC/MPI/pdnaupd.f -@@ -650,9 +650,9 @@ subroutine pdnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call pdvout (comm, logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') -diff --git a/PARPACK/SRC/MPI/pdneupd.f b/PARPACK/SRC/MPI/pdneupd.f -index f80651e2..d5741956 100644 ---- a/PARPACK/SRC/MPI/pdneupd.f -+++ b/PARPACK/SRC/MPI/pdneupd.f -@@ -617,9 +617,9 @@ subroutine pdneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/MPI/pdngets.f b/PARPACK/SRC/MPI/pdngets.f -index 4ff35165..c4294b8c 100644 ---- a/PARPACK/SRC/MPI/pdngets.f -+++ b/PARPACK/SRC/MPI/pdngets.f -@@ -226,8 +226,8 @@ subroutine pdngets - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call pdvout (comm, logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call pdvout (comm, logfil, kev+np, ritzi, ndigit, -diff --git a/PARPACK/SRC/MPI/pdnorm2.f b/PARPACK/SRC/MPI/pdnorm2.f -index 0e149585..5061d3d9 100644 ---- a/PARPACK/SRC/MPI/pdnorm2.f -+++ b/PARPACK/SRC/MPI/pdnorm2.f -@@ -45,7 +45,7 @@ Double precision function pdnorm2 ( comm, n, x, inc ) - c %---------------% - c - Double precision -- & max, buf, zero -+ & max, buf, zero, buf2(1) - parameter ( zero = 0.0 ) - c - c %---------------------% -@@ -69,15 +69,16 @@ Double precision function pdnorm2 ( comm, n, x, inc ) - pdnorm2 = dnrm2( n, x, inc) - c - buf = pdnorm2 -- call MPI_ALLREDUCE( buf, max, 1, MPI_DOUBLE_PRECISION, -+ call MPI_ALLREDUCE( [buf], buf2, 1, MPI_DOUBLE_PRECISION, - & MPI_MAX, comm, ierr ) -+ max = buf2(1) - if ( max .eq. zero ) then - pdnorm2 = zero - else - buf = (pdnorm2/max)**2.0 -- call MPI_ALLREDUCE( buf, pdnorm2, 1, MPI_DOUBLE_PRECISION, -+ call MPI_ALLREDUCE( [buf], buf2, 1, MPI_DOUBLE_PRECISION, - & MPI_SUM, comm, ierr ) -- pdnorm2 = max * sqrt(abs(pdnorm2)) -+ pdnorm2 = max * sqrt(abs(buf2(1))) - endif - c - c %----------------% -diff --git a/PARPACK/SRC/MPI/pdsaitr.f b/PARPACK/SRC/MPI/pdsaitr.f -index 5fe84b81..42396c11 100644 ---- a/PARPACK/SRC/MPI/pdsaitr.f -+++ b/PARPACK/SRC/MPI/pdsaitr.f -@@ -264,7 +264,7 @@ subroutine pdsaitr - integer i, ierr, ipj, irj, ivj, iter, itry, j, msglvl, infol, - & jj - Double precision -- & rnorm1, wnorm, safmin, temp1 -+ & rnorm1, wnorm, safmin, temp1, buf2(1) - save orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, - & rnorm1, safmin, wnorm -@@ -392,9 +392,9 @@ subroutine pdsaitr - 1000 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -412,7 +412,7 @@ subroutine pdsaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -572,14 +572,14 @@ subroutine pdsaitr - c %----------------------------------% - c - rnorm_buf = ddot (n, resid, 1, workd(ivj), 1) -- call MPI_ALLREDUCE( rnorm_buf, wnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- wnorm = sqrt(abs(wnorm)) -+ wnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, wnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- wnorm = sqrt(abs(wnorm)) -+ wnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - wnorm = pdnorm2( comm, n, resid, 1 ) - end if -@@ -669,9 +669,9 @@ subroutine pdsaitr - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = pdnorm2( comm, n, resid, 1 ) - end if -@@ -769,15 +769,15 @@ subroutine pdsaitr - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm1, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2(1), 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm1 = sqrt(abs(rnorm1)) -+ rnorm1 = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm1 = pdnorm2( comm, n, resid, 1 ) - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/MPI/pdsapps.f b/PARPACK/SRC/MPI/pdsapps.f -index e79db4e3..3feb8da0 100644 ---- a/PARPACK/SRC/MPI/pdsapps.f -+++ b/PARPACK/SRC/MPI/pdsapps.f -@@ -272,9 +272,9 @@ subroutine pdsapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call pdvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -443,7 +443,7 @@ subroutine pdsapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call pdvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -diff --git a/PARPACK/SRC/MPI/pdsaup2.f b/PARPACK/SRC/MPI/pdsaup2.f -index 820459b3..a575b33f 100644 ---- a/PARPACK/SRC/MPI/pdsaup2.f -+++ b/PARPACK/SRC/MPI/pdsaup2.f -@@ -212,7 +212,7 @@ subroutine pdsaup2 - integer ido, info, ishift, iupd, ldh, ldq, ldv, mxiter, - & n, mode, nev, np - Double precision -- & tol -+ & tol, buf2(1) - c - c %-----------------% - c | Array Arguments | -@@ -424,13 +424,13 @@ subroutine pdsaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -469,7 +469,7 @@ subroutine pdsaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -719,7 +719,7 @@ subroutine pdsaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -766,7 +766,7 @@ subroutine pdsaup2 - if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call pdvout (comm, logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -825,9 +825,9 @@ subroutine pdsaup2 - c - if (bmat .eq. 'G') then - rnorm_buf = ddot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_DOUBLE_PRECISION, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = pdnorm2( comm, n, resid, 1 ) - end if -@@ -835,7 +835,7 @@ subroutine pdsaup2 - 130 continue - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call pdvout (comm, logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') -diff --git a/PARPACK/SRC/MPI/pdsaupd.f b/PARPACK/SRC/MPI/pdsaupd.f -index 47d05227..f505dc90 100644 ---- a/PARPACK/SRC/MPI/pdsaupd.f -+++ b/PARPACK/SRC/MPI/pdsaupd.f -@@ -652,9 +652,9 @@ subroutine pdsaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call pdvout (comm, logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') -diff --git a/PARPACK/SRC/MPI/pdseupd.f b/PARPACK/SRC/MPI/pdseupd.f -index 9e866ab7..66e85995 100644 ---- a/PARPACK/SRC/MPI/pdseupd.f -+++ b/PARPACK/SRC/MPI/pdseupd.f -@@ -523,9 +523,9 @@ subroutine pdseupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/MPI/pdsgets.f b/PARPACK/SRC/MPI/pdsgets.f -index 01b52394..c71421b4 100644 ---- a/PARPACK/SRC/MPI/pdsgets.f -+++ b/PARPACK/SRC/MPI/pdsgets.f -@@ -216,8 +216,8 @@ subroutine pdsgets - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_sgets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_sgets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_sgets: NP is') - call pdvout (comm, logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call pdvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/MPI/pdznorm2.f b/PARPACK/SRC/MPI/pdznorm2.f -index 7a7173f3..4651679b 100644 ---- a/PARPACK/SRC/MPI/pdznorm2.f -+++ b/PARPACK/SRC/MPI/pdznorm2.f -@@ -45,7 +45,7 @@ Double precision function pdznorm2 ( comm, n, x, inc ) - c %---------------% - c - Double precision -- & max, buf, zero -+ & max(1), buf, zero - parameter ( zero = 0.0 ) - c - c %---------------------% -@@ -59,7 +59,7 @@ Double precision function pdznorm2 ( comm, n, x, inc ) - c %--------------------% - c - Double precision -- & dznrm2 -+ & dznrm2, buf2(1) - External dznrm2 - c - c %-----------------------% -@@ -69,15 +69,15 @@ Double precision function pdznorm2 ( comm, n, x, inc ) - pdznorm2 = dznrm2( n, x, inc) - c - buf = pdznorm2 -- call MPI_ALLREDUCE( buf, max, 1, MPI_DOUBLE_PRECISION, -+ call MPI_ALLREDUCE( [buf], max, 1, MPI_DOUBLE_PRECISION, - & MPI_MAX, comm, ierr ) -- if ( max .eq. zero ) then -+ if ( max(1) .eq. zero ) then - pdznorm2 = zero - else -- buf = (pdznorm2/max)**2.0 -- call MPI_ALLREDUCE( buf, pdznorm2, 1, MPI_DOUBLE_PRECISION, -+ buf = (pdznorm2/max(1))**2.0 -+ call MPI_ALLREDUCE( [buf], buf2, 1, MPI_DOUBLE_PRECISION, - & MPI_SUM, comm, ierr ) -- pdznorm2 = max * sqrt(abs(pdznorm2)) -+ pdznorm2 = max(1) * sqrt(abs(buf2(1))) - endif - c - c %-----------------% -diff --git a/PARPACK/SRC/MPI/pscnorm2.f b/PARPACK/SRC/MPI/pscnorm2.f -index 2c64831e..50dea8bd 100644 ---- a/PARPACK/SRC/MPI/pscnorm2.f -+++ b/PARPACK/SRC/MPI/pscnorm2.f -@@ -45,7 +45,7 @@ Real function pscnorm2 ( comm, n, x, inc ) - c %---------------% - c - Real -- & max, buf, zero -+ & max(1), buf, zero - parameter ( zero = 0.0 ) - c - c %---------------------% -@@ -61,6 +61,7 @@ Real function pscnorm2 ( comm, n, x, inc ) - Real - & scnrm2 - External scnrm2 -+ Real buf2(1) - c - c %-----------------------% - c | Executable Statements | -@@ -69,15 +70,15 @@ Real function pscnorm2 ( comm, n, x, inc ) - pscnorm2 = scnrm2( n, x, inc) - c - buf = pscnorm2 -- call MPI_ALLREDUCE( buf, max, 1, MPI_REAL, -+ call MPI_ALLREDUCE( [buf], max, 1, MPI_REAL, - & MPI_MAX, comm, ierr ) -- if ( max .eq. zero ) then -+ if ( max(1) .eq. zero ) then - pscnorm2 = zero - else -- buf = (pscnorm2/max)**2.0 -- call MPI_ALLREDUCE( buf, pscnorm2, 1, MPI_REAL, -+ buf = (pscnorm2/max(1))**2.0 -+ call MPI_ALLREDUCE( [buf], buf2, 1, MPI_REAL, - & MPI_SUM, comm, ierr ) -- pscnorm2 = max * sqrt(abs(pscnorm2)) -+ pscnorm2 = max(1) * sqrt(abs(buf2(1))) - endif - c - c %-----------------% -diff --git a/PARPACK/SRC/MPI/psgetv0.f b/PARPACK/SRC/MPI/psgetv0.f -index a721c9b9..597212b5 100644 ---- a/PARPACK/SRC/MPI/psgetv0.f -+++ b/PARPACK/SRC/MPI/psgetv0.f -@@ -163,7 +163,7 @@ subroutine psgetv0 - c - integer ipntr(3) - Real -- & resid(n), v(ldv,j), workd(2*n), workl(2*j) -+ & resid(n), v(ldv,j), workd(2*n), workl(2*j), buf2(1) - c - c %------------% - c | Parameters | -@@ -318,9 +318,9 @@ subroutine psgetv0 - first = .FALSE. - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm0, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm0 = sqrt(abs(rnorm0)) -+ rnorm0 = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm0 = psnorm2( comm, n, resid, 1 ) - end if -@@ -379,9 +379,9 @@ subroutine psgetv0 - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = psnorm2( comm, n, resid, 1 ) - end if -@@ -391,9 +391,9 @@ subroutine psgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm0, ndigit, -+ call psvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -424,7 +424,7 @@ subroutine psgetv0 - 50 continue - c - if (msglvl .gt. 0) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/MPI/pslamch10.f b/PARPACK/SRC/MPI/pslamch10.f -index cd7215c5..c3c13b8e 100644 ---- a/PARPACK/SRC/MPI/pslamch10.f -+++ b/PARPACK/SRC/MPI/pslamch10.f -@@ -53,7 +53,7 @@ REAL FUNCTION PSLAMCH10( ICTXT, CMACH ) - * - * .. Local Scalars .. - INTEGER IDUMM -- REAL TEMP, TEMP1 -+ REAL TEMP, TEMP1, buf2(1) - * .. - * .. External Subroutines .. - * EXTERNAL SGAMN2D, SGAMX2D -@@ -69,14 +69,16 @@ REAL FUNCTION PSLAMCH10( ICTXT, CMACH ) - * - IF( LSAME( CMACH, 'E' ).OR.LSAME( CMACH, 'S' ).OR. - $ LSAME( CMACH, 'M' ).OR.LSAME( CMACH, 'U' ) ) THEN -- CALL MPI_ALLREDUCE( TEMP1, TEMP, 1, MPI_REAL, -+ CALL MPI_ALLREDUCE( [TEMP1], buf2, 1, MPI_REAL, - $ MPI_MAX, ICTXT, IDUMM ) --* CALL SGAMX2D( ICTXT, 'All', ' ', 1, 1, TEMP, 1, IDUMM, -+ TEMP = buf2(1) -+* CALL SGAMX2D( ICTXT, 'All', ' ', 1, 1, TEMP, 1, IDUMM, - * $ IDUMM, 1, -1, IDUMM ) - ELSE IF( LSAME( CMACH, 'L' ).OR.LSAME( CMACH, 'O' ) ) THEN -- CALL MPI_ALLREDUCE( TEMP1, TEMP, 1, MPI_REAL, -+ CALL MPI_ALLREDUCE( [TEMP1], buf2, 1, MPI_REAL, - $ MPI_MIN, ICTXT, IDUMM ) --* CALL SGAMN2D( ICTXT, 'All', ' ', 1, 1, TEMP, 1, IDUMM, -+ TEMP = buf2(1) -+* CALL SGAMN2D( ICTXT, 'All', ' ', 1, 1, TEMP, 1, IDUMM, - * $ IDUMM, 1, -1, IDUMM ) - ELSE - TEMP = TEMP1 -diff --git a/PARPACK/SRC/MPI/psnaitr.f b/PARPACK/SRC/MPI/psnaitr.f -index ab63f99a..8b5f635d 100644 ---- a/PARPACK/SRC/MPI/psnaitr.f -+++ b/PARPACK/SRC/MPI/psnaitr.f -@@ -276,7 +276,7 @@ subroutine psnaitr - & betaj, rnorm1, smlnum, ulp, unfl, wnorm - c - Real -- & rnorm_buf -+ & rnorm_buf, buf2(1) - c - c - c %-----------------------% -@@ -393,9 +393,9 @@ subroutine psnaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -415,7 +415,7 @@ subroutine psnaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -566,9 +566,9 @@ subroutine psnaitr - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, wnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- wnorm = sqrt(abs(wnorm)) -+ wnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - wnorm = psnorm2( comm, n, resid, 1 ) - end if -@@ -642,9 +642,9 @@ subroutine psnaitr - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = psnorm2( comm, n, resid, 1 ) - end if -@@ -745,15 +745,15 @@ subroutine psnaitr - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm1, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm1 = sqrt(abs(rnorm1)) -+ rnorm1 = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm1 = psnorm2( comm, n, resid, 1 ) - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/MPI/psnapps.f b/PARPACK/SRC/MPI/psnapps.f -index c06fba58..b6f8645b 100644 ---- a/PARPACK/SRC/MPI/psnapps.f -+++ b/PARPACK/SRC/MPI/psnapps.f -@@ -276,11 +276,11 @@ subroutine psnapps - sigmai = shifti(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call psvout (comm, logfil, 1, sigmar, ndigit, -+ call psvout (comm, logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call psvout (comm, logfil, 1, sigmai, ndigit, -+ call psvout (comm, logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if - c -@@ -345,9 +345,9 @@ subroutine psnapps - & tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call psvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -361,9 +361,9 @@ subroutine psnapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -635,7 +635,7 @@ subroutine psnapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call psvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call psmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/MPI/psnaup2.f b/PARPACK/SRC/MPI/psnaup2.f -index 6195d4b6..bfca7fb1 100644 ---- a/PARPACK/SRC/MPI/psnaup2.f -+++ b/PARPACK/SRC/MPI/psnaup2.f -@@ -241,7 +241,7 @@ subroutine psnaup2 - c - - Real -- & rnorm_buf -+ & rnorm_buf, buf2(1) - c - c %-----------------------% - c | Local array arguments | -@@ -408,7 +408,7 @@ subroutine psnaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -421,9 +421,9 @@ subroutine psnaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -455,7 +455,7 @@ subroutine psnaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -699,7 +699,7 @@ subroutine psnaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -751,7 +751,7 @@ subroutine psnaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call psvout (comm, logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') -@@ -810,16 +810,16 @@ subroutine psnaup2 - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = psnorm2( comm, n, resid, 1 ) - end if - cnorm = .false. - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call psmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/MPI/psnaupd.f b/PARPACK/SRC/MPI/psnaupd.f -index a55f5fba..35e85b74 100644 ---- a/PARPACK/SRC/MPI/psnaupd.f -+++ b/PARPACK/SRC/MPI/psnaupd.f -@@ -650,9 +650,9 @@ subroutine psnaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call psvout (comm, logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') -diff --git a/PARPACK/SRC/MPI/psneupd.f b/PARPACK/SRC/MPI/psneupd.f -index c7f939a4..d4090b66 100644 ---- a/PARPACK/SRC/MPI/psneupd.f -+++ b/PARPACK/SRC/MPI/psneupd.f -@@ -617,9 +617,9 @@ subroutine psneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/MPI/psngets.f b/PARPACK/SRC/MPI/psngets.f -index c4bf9ac7..91a6d730 100644 ---- a/PARPACK/SRC/MPI/psngets.f -+++ b/PARPACK/SRC/MPI/psngets.f -@@ -226,8 +226,8 @@ subroutine psngets - tngets = tngets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call psvout (comm, logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call psvout (comm, logfil, kev+np, ritzi, ndigit, -diff --git a/PARPACK/SRC/MPI/psnorm2.f b/PARPACK/SRC/MPI/psnorm2.f -index b5fbcd13..8e487b35 100644 ---- a/PARPACK/SRC/MPI/psnorm2.f -+++ b/PARPACK/SRC/MPI/psnorm2.f -@@ -45,7 +45,7 @@ Real function psnorm2 ( comm, n, x, inc ) - c %---------------% - c - Real -- & max, buf, zero -+ & max, buf, zero, buf2(1) - parameter ( zero = 0.0 ) - c - c %---------------------% -@@ -69,15 +69,16 @@ Real function psnorm2 ( comm, n, x, inc ) - psnorm2 = snrm2( n, x, inc) - c - buf = psnorm2 -- call MPI_ALLREDUCE( buf, max, 1, MPI_REAL, -+ call MPI_ALLREDUCE( [buf], buf2, 1, MPI_REAL, - & MPI_MAX, comm, ierr ) -+ max = buf2(1) - if ( max .eq. zero ) then - psnorm2 = zero - else - buf = (psnorm2/max)**2.0 -- call MPI_ALLREDUCE( buf, psnorm2, 1, MPI_REAL, -+ call MPI_ALLREDUCE( [buf], buf2, 1, MPI_REAL, - & MPI_SUM, comm, ierr ) -- psnorm2 = max * sqrt(abs(psnorm2)) -+ psnorm2 = max * sqrt(abs(buf2(1))) - endif - c - c %----------------% -diff --git a/PARPACK/SRC/MPI/pssaitr.f b/PARPACK/SRC/MPI/pssaitr.f -index a0fde737..8ceaebe4 100644 ---- a/PARPACK/SRC/MPI/pssaitr.f -+++ b/PARPACK/SRC/MPI/pssaitr.f -@@ -264,7 +264,7 @@ subroutine pssaitr - integer i, ierr, ipj, irj, ivj, iter, itry, j, msglvl, infol, - & jj - Real -- & rnorm1, wnorm, safmin, temp1 -+ & rnorm1, wnorm(1), safmin, temp1, temp2(1) - save orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, - & rnorm1, safmin, wnorm -@@ -392,9 +392,9 @@ subroutine pssaitr - 1000 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if - c -@@ -412,7 +412,7 @@ subroutine pssaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if - c -@@ -572,16 +572,16 @@ subroutine pssaitr - c %----------------------------------% - c - rnorm_buf = sdot (n, resid, 1, workd(ivj), 1) -- call MPI_ALLREDUCE( rnorm_buf, wnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], wnorm, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- wnorm = sqrt(abs(wnorm)) -+ wnorm(1) = sqrt(abs(wnorm(1))) - else if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, wnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], wnorm, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'I') then -- wnorm = psnorm2( comm, n, resid, 1 ) -+ wnorm(1) = psnorm2( comm, n, resid, 1 ) - end if - c - c %-----------------------------------------% -@@ -669,9 +669,9 @@ subroutine pssaitr - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], temp2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(temp2(1))) - else if (bmat .eq. 'I') then - rnorm = psnorm2( comm, n, resid, 1 ) - end if -@@ -691,7 +691,7 @@ subroutine pssaitr - c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | - c %-----------------------------------------------------------% - c -- if (rnorm .gt. 0.717*wnorm) go to 100 -+ if (rnorm .gt. 0.717*wnorm(1)) go to 100 - nrorth = nrorth + 1 - c - c %---------------------------------------------------% -@@ -704,7 +704,7 @@ subroutine pssaitr - 80 continue - c - if (msglvl .gt. 2) then -- xtemp(1) = wnorm -+ xtemp(1) = wnorm(1) - xtemp(2) = rnorm - call psvout (comm, logfil, 2, xtemp, ndigit, - & '_naitr: re-orthonalization ; wnorm and rnorm are') -@@ -769,15 +769,15 @@ subroutine pssaitr - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm1, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], temp2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm1 = sqrt(abs(rnorm1)) -+ rnorm1 = sqrt(abs(temp2(1))) - else if (bmat .eq. 'I') then - rnorm1 = psnorm2( comm, n, resid, 1 ) - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm -diff --git a/PARPACK/SRC/MPI/pssapps.f b/PARPACK/SRC/MPI/pssapps.f -index 481cc355..07f96452 100644 ---- a/PARPACK/SRC/MPI/pssapps.f -+++ b/PARPACK/SRC/MPI/pssapps.f -@@ -271,9 +271,9 @@ subroutine pssapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_sapps: occurred before shift number.') - call psvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -@@ -442,7 +442,7 @@ subroutine pssapps - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_sapps: deflation at row/column no.') - call psvout (comm, logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') -diff --git a/PARPACK/SRC/MPI/pssaup2.f b/PARPACK/SRC/MPI/pssaup2.f -index ab00ec77..25af8b7f 100644 ---- a/PARPACK/SRC/MPI/pssaup2.f -+++ b/PARPACK/SRC/MPI/pssaup2.f -@@ -241,7 +241,7 @@ subroutine pssaup2 - integer ierr, iter, j, kplusp, msglvl, nconv, nevbef, nev0, - & np0, nptemp, nevd2, nevm2, kp(3) - Real -- & rnorm, temp, eps23 -+ & rnorm, temp, eps23, buf2(1) - save cnorm, getv0, initv, update, ushift, - & iter, kplusp, msglvl, nconv, nev0, np0, - & rnorm, eps23 -@@ -424,13 +424,13 @@ subroutine pssaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if - c -@@ -469,7 +469,7 @@ subroutine pssaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if - c -@@ -719,7 +719,7 @@ subroutine pssaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -766,7 +766,7 @@ subroutine pssaup2 - if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1) - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call psvout (comm, logfil, np, workl, ndigit, - & '_saup2: shifts selected') -@@ -825,9 +825,9 @@ subroutine pssaup2 - c - if (bmat .eq. 'G') then - rnorm_buf = sdot (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( rnorm_buf, rnorm, 1, -+ call MPI_ALLREDUCE( [rnorm_buf], buf2, 1, - & MPI_REAL, MPI_SUM, comm, ierr ) -- rnorm = sqrt(abs(rnorm)) -+ rnorm = sqrt(abs(buf2(1))) - else if (bmat .eq. 'I') then - rnorm = psnorm2( comm, n, resid, 1 ) - end if -@@ -835,7 +835,7 @@ subroutine pssaup2 - 130 continue - c - if (msglvl .gt. 2) then -- call psvout (comm, logfil, 1, rnorm, ndigit, -+ call psvout (comm, logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call psvout (comm, logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') -diff --git a/PARPACK/SRC/MPI/pssaupd.f b/PARPACK/SRC/MPI/pssaupd.f -index 7f616008..3077ff5f 100644 ---- a/PARPACK/SRC/MPI/pssaupd.f -+++ b/PARPACK/SRC/MPI/pssaupd.f -@@ -652,9 +652,9 @@ subroutine pssaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_saupd: number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_saupd: number of "converged" Ritz values') - call psvout (comm, logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') -diff --git a/PARPACK/SRC/MPI/psseupd.f b/PARPACK/SRC/MPI/psseupd.f -index 23e2caad..85175870 100644 ---- a/PARPACK/SRC/MPI/psseupd.f -+++ b/PARPACK/SRC/MPI/psseupd.f -@@ -523,9 +523,9 @@ subroutine psseupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/MPI/pssgets.f b/PARPACK/SRC/MPI/pssgets.f -index 487689b0..dcc08bcb 100644 ---- a/PARPACK/SRC/MPI/pssgets.f -+++ b/PARPACK/SRC/MPI/pssgets.f -@@ -216,8 +216,8 @@ subroutine pssgets - tsgets = tsgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_sgets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_sgets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_sgets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_sgets: NP is') - call psvout (comm, logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call psvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/PARPACK/SRC/MPI/pzgetv0.f b/PARPACK/SRC/MPI/pzgetv0.f -index 42cd0865..29f18f5b 100644 ---- a/PARPACK/SRC/MPI/pzgetv0.f -+++ b/PARPACK/SRC/MPI/pzgetv0.f -@@ -185,7 +185,7 @@ subroutine pzgetv0 - save first, iseed, inits, iter, msglvl, orth, rnorm0 - c - Complex*16 -- & cnorm_buf -+ & cnorm_buf, buf2(1) - c - c %----------------------% - c | External Subroutines | -@@ -332,8 +332,9 @@ subroutine pzgetv0 - first = .FALSE. - if (bmat .eq. 'G') then - cnorm_buf = zdotc (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_DOUBLE_COMPLEX , MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm0 = sqrt(dlapy2 (dble (cnorm),dimag (cnorm))) - else if (bmat .eq. 'I') then - rnorm0 = pdznorm2 ( comm, n, resid, 1) -@@ -393,8 +394,9 @@ subroutine pzgetv0 - c - if (bmat .eq. 'G') then - cnorm_buf = zdotc (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_DOUBLE_COMPLEX , MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm = sqrt(dlapy2 (dble (cnorm),dimag (cnorm))) - else if (bmat .eq. 'I') then - rnorm = pdznorm2 (comm, n, resid, 1) -@@ -405,9 +407,9 @@ subroutine pzgetv0 - c %--------------------------------------% - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm0, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if - c -@@ -439,7 +441,7 @@ subroutine pzgetv0 - c - if (msglvl .gt. 0) then - cnorm2 = dcmplx (rnorm,rzero) -- call pzvout (comm, logfil, 1, cnorm2, ndigit, -+ call pzvout (comm, logfil, 1, [cnorm2], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then -diff --git a/PARPACK/SRC/MPI/pznaitr.f b/PARPACK/SRC/MPI/pznaitr.f -index 0b8af181..4ec77e4e 100644 ---- a/PARPACK/SRC/MPI/pznaitr.f -+++ b/PARPACK/SRC/MPI/pznaitr.f -@@ -293,7 +293,7 @@ subroutine pznaitr - & betaj, rnorm1, smlnum, ulp, unfl, wnorm - c - Complex*16 -- & cnorm_buf -+ & cnorm_buf, buf2(1) - c - c %----------------------% - c | External Subroutines | -@@ -404,9 +404,9 @@ subroutine pznaitr - 1000 continue - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call pzvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if - c -@@ -426,7 +426,7 @@ subroutine pznaitr - c %---------------------------------------------------% - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if - c -@@ -577,9 +577,10 @@ subroutine pznaitr - c - if (bmat .eq. 'G') then - cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr ) -- wnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) -+ cnorm = buf2(1) -+ wnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) - else if (bmat .eq. 'I') then - wnorm = pdznorm2(comm, n, resid, 1) - end if -@@ -653,8 +654,9 @@ subroutine pznaitr - c - if (bmat .eq. 'G') then - cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr ) -+ cnorm = buf2(1) - rnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm = pdznorm2(comm, n, resid, 1) -@@ -757,15 +759,16 @@ subroutine pznaitr - c - if (bmat .eq. 'G') then - cnorm_buf = zdotc (n, resid, 1, workd(ipj), 1) -- call MPI_ALLREDUCE( cnorm_buf, cnorm, 1, -+ call MPI_ALLREDUCE( [cnorm_buf], buf2, 1, - & MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr ) -- rnorm1 = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) -+ cnorm = buf2(1) -+ rnorm1 = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm1 = pdznorm2(comm, n, resid, 1) - end if - c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then -- call pivout (comm, logfil, 1, j, ndigit, -+ call pivout (comm, logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm -diff --git a/PARPACK/SRC/MPI/pznapps.f b/PARPACK/SRC/MPI/pznapps.f -index 3e00c903..4952544c 100644 ---- a/PARPACK/SRC/MPI/pznapps.f -+++ b/PARPACK/SRC/MPI/pznapps.f -@@ -283,9 +283,9 @@ subroutine pznapps - sigma = shift(jj) - c - if (msglvl .gt. 2 ) then -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call pzvout (comm, logfil, 1, sigma, ndigit, -+ call pzvout (comm, logfil, 1, [sigma], ndigit, - & '_napps: Value of the shift ') - end if - c -@@ -306,9 +306,9 @@ subroutine pznapps - if ( abs(dble(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, i, ndigit, -+ call pivout (comm, logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call pivout (comm, logfil, 1, jj, ndigit, -+ call pivout (comm, logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call pzvout (comm, logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') -@@ -322,9 +322,9 @@ subroutine pznapps - 40 continue - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, istart, ndigit, -+ call pivout (comm, logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call pivout (comm, logfil, 1, iend, ndigit, -+ call pivout (comm, logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if - c -@@ -500,7 +500,7 @@ subroutine pznapps - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call pzvout (comm, logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call pivout (comm, logfil, 1, kev, ndigit, -+ call pivout (comm, logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call pzmout (comm, logfil, kev, kev, h, ldh, ndigit, -diff --git a/PARPACK/SRC/MPI/pznaup2.f b/PARPACK/SRC/MPI/pznaup2.f -index bf3c2016..78521979 100644 ---- a/PARPACK/SRC/MPI/pznaup2.f -+++ b/PARPACK/SRC/MPI/pznaup2.f -@@ -237,7 +237,7 @@ subroutine pznaup2 - & nevbef, nev0 , np0, eps23 - c - Double precision -- & cmpnorm_buf -+ & cmpnorm_buf, buf2(1) - c - c %-----------------------% - c | Local array arguments | -@@ -401,7 +401,7 @@ subroutine pznaup2 - iter = iter + 1 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, iter, ndigit, -+ call pivout (comm, logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if - c -@@ -414,9 +414,9 @@ subroutine pznaup2 - np = kplusp - nev - c - if (msglvl .gt. 1) then -- call pivout (comm, logfil, 1, nev, ndigit, -+ call pivout (comm, logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if - c -@@ -443,7 +443,7 @@ subroutine pznaup2 - update = .false. - c - if (msglvl .gt. 1) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if - c -@@ -674,7 +674,7 @@ subroutine pznaup2 - end if - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, nconv, ndigit, -+ call pivout (comm, logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev -@@ -714,7 +714,7 @@ subroutine pznaup2 - end if - c - if (msglvl .gt. 2) then -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call pzvout (comm, logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') -@@ -771,8 +771,9 @@ subroutine pznaup2 - c - if (bmat .eq. 'G') then - cmpnorm_buf = zdotc (n, resid, 1, workd, 1) -- call MPI_ALLREDUCE( cmpnorm_buf, cmpnorm, 1, -+ call MPI_ALLREDUCE( [cmpnorm_buf], buf2, 1, - & MPI_DOUBLE_COMPLEX, MPI_SUM, comm, ierr ) -+ cmpnorm = buf2(1) - rnorm = sqrt(dlapy2(dble(cmpnorm),dimag(cmpnorm))) - else if (bmat .eq. 'I') then - rnorm = pdznorm2(comm, n, resid, 1) -@@ -780,7 +781,7 @@ subroutine pznaup2 - cnorm = .false. - c - if (msglvl .gt. 2) then -- call pdvout (comm, logfil, 1, rnorm, ndigit, -+ call pdvout (comm, logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call pzmout (comm, logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') -diff --git a/PARPACK/SRC/MPI/pznaupd.f b/PARPACK/SRC/MPI/pznaupd.f -index 979402b3..7d6ea4c4 100644 ---- a/PARPACK/SRC/MPI/pznaupd.f -+++ b/PARPACK/SRC/MPI/pznaupd.f -@@ -626,9 +626,9 @@ subroutine pznaupd - if (info .eq. 2) info = 3 - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, mxiter, ndigit, -+ call pivout (comm, logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call pivout (comm, logfil, 1, np, ndigit, -+ call pivout (comm, logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call pzvout (comm, logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') -diff --git a/PARPACK/SRC/MPI/pzneupd.f b/PARPACK/SRC/MPI/pzneupd.f -index 4bb1173a..7b6e7fe1 100644 ---- a/PARPACK/SRC/MPI/pzneupd.f -+++ b/PARPACK/SRC/MPI/pzneupd.f -@@ -558,9 +558,9 @@ subroutine pzneupd - c %-----------------------------------------------------------% - c - if (msglvl .gt. 2) then -- call pivout(comm, logfil, 1, numcnv, ndigit, -+ call pivout(comm, logfil, 1, [numcnv], ndigit, - & '_neupd: Number of specified eigenvalues') -- call pivout(comm, logfil, 1, nconv, ndigit, -+ call pivout(comm, logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if - c -diff --git a/PARPACK/SRC/MPI/pzngets.f b/PARPACK/SRC/MPI/pzngets.f -index 97bc4070..cb58f5ce 100644 ---- a/PARPACK/SRC/MPI/pzngets.f -+++ b/PARPACK/SRC/MPI/pzngets.f -@@ -177,8 +177,8 @@ subroutine pzngets ( comm, ishift, which, kev, np, ritz, bounds) - tcgets = tcgets + (t1 - t0) - c - if (msglvl .gt. 0) then -- call pivout (comm, logfil, 1, kev, ndigit, '_ngets: KEV is') -- call pivout (comm, logfil, 1, np, ndigit, '_ngets: NP is') -+ call pivout (comm, logfil, 1, [kev], ndigit, '_ngets: KEV is') -+ call pivout (comm, logfil, 1, [np], ndigit, '_ngets: NP is') - call pzvout (comm, logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call pzvout (comm, logfil, kev+np, bounds, ndigit, -diff --git a/scripts/travis_fedora.sh b/scripts/travis_fedora.sh -new file mode 100755 -index 00000000..0bfa5736 ---- /dev/null -+++ b/scripts/travis_fedora.sh -@@ -0,0 +1,51 @@ -+#!/bin/sh -+## -e : Make sure all errors cause the script to fail -+## -x be verbose; write what we are doing, as we do it -+set -ex -+## Should we init a container? -+if [ ".$1" = .setup ] -+then -+ # fedora -+ # note: when you PR, docker-cp provides, in the container, the branch associated with the PR (not master where there's nothing new) -+ # 1. docker create --name mobydick IMAGE CMD <=> create a container (= instance of image) but container is NOT yet started -+ # 2. docker cp -a ${TRAVIS_BUILD_DIR} mobydick:/tmp <=> copy git repository (CI worker, checkout-ed on PR branch) into the container -+ # note: docker-cp works only if copy from/to containers (not images) -+ # 3. docker start -a mobydick <=> start to run the container (initialized with docker-cp) -+ test . != ".$2" && mpi="$2" || mpi=openmpi -+ test . != ".$3" && version="$3" || version=latest -+ time sudo docker pull registry.fedoraproject.org/fedora:$version || -+ sudo docker pull fedora:$version -+ time sudo docker create --name mobydick fedora:$version \ -+ /tmp/arpack-ng/scripts/travis_fedora.sh $mpi -+ time sudo docker cp -a ${TRAVIS_BUILD_DIR} mobydick:/tmp -+ time sudo docker start -a mobydick ; e=$? -+ exit $e -+fi -+ -+test . != ".$1" && mpi="$1" || mpi=openmpi -+ -+## If we are called as root, setup everything -+if [ $UID -eq 0 ] -+then -+ time dnf -y upgrade -+ time dnf -y install environment-modules git \ -+ gfortran openblas-devel cmake ${mpi}-devel make gcc-c++ -+ useradd test -+ chown -R test /tmp -+ sudo -u test $0 $mpi -+## If we are called as normal user, run test -+else -+ . /etc/profile.d/modules.sh -+ module load mpi -+ export OMPI_MCA_rmaps_base_oversubscribe=yes -+ cd /tmp -+ cd arpack-ng -+ git status -+ git log -2 -+ mkdir -p build && cd build -+ time cmake -DEXAMPLES=ON -DMPI=ON -DICB=ON .. -+ export VERBOSE=1 -+ time make all -+ time make test -+ tail -n 300 ./Testing/Temporary/LastTest.log -+fi
--- a/src/arpack.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/arpack.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := arpack $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.0 -$(PKG)_CHECKSUM := cb5a6e1f3c5ab231440bbe30f4a0808d76215e93 +$(PKG)_VERSION := 3.8.0 +$(PKG)_CHECKSUM := 6b89dc1b298e1db7df17094308fc3309afa49618 $(PKG)_SUBDIR := $(PKG)-ng-$($(PKG)_VERSION) $(PKG)_FILE := arpack-ng_$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/opencollab/arpack-ng/archive/$($(PKG)_VERSION).tar.gz @@ -28,8 +28,8 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/opencollab/arpack-ng/releases' | \ - $(SED) -n 's,.*href="/opencollab/arpack-ng/archive/\([0-9][^"]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/opencollab/arpack-ng/tags' | \ + $(SED) -n 's,.*releases/tag/\([^"]*\).*,\1,p' | \ head -1 endef
--- a/src/biosig.mk Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := biosig -$(PKG)_WEBSITE := http://biosig.sf.net/ -$(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.1 -$(PKG)_CHECKSUM := f16bfc7e0f05901e09283020d7cd565bed13c75e -$(PKG)_SUBDIR := biosig-$($(PKG)_VERSION) -$(PKG)_FILE := biosig-$($(PKG)_VERSION).src.tar.gz -$(PKG)_URL := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE) -$(PKG)_DEPS := suitesparse zlib libb64 libiberty libiconv lapack tinyxml dcmtk - -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://biosig.sourceforge.io/download.html' | \ - $(SED) -n 's_.*>v\([0-9]\.[0-9]\.[0-9]\)<.*_\1_p' | \ - head -1 -endef - - -define $(PKG)_BUILD - cd '$(1)' && ./configure \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - --prefix=$(HOST_PREFIX) \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) - - # make sure NDEBUG is defined - $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/biosig4c++/Makefile - - TARGET=$(TARGET) CROSS=$(TARGET) $(MAKE) -C '$(1)' lib tools - - # build mexbiosig package (does not install package) - # TARGET='$(TARGET)' $(MAKE) -C '$(1)'/biosig4c++ mexbiosig - - # install library files - $(INSTALL) -m644 '$(1)/biosig4c++/biosig.h' '$(HOST_INCDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/biosig2.h' '$(HOST_INCDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/gdftime.h' '$(HOST_INCDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/biosig-dev.h' '$(HOST_INCDIR)/' - - $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.a' '$(HOST_LIBDIR)/' - #$(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.def' '$(HOST_LIBDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll.a' '$(HOST_LIBDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.dll' '$(HOST_BINDIR)/' - - $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.a' '$(HOST_LIBDIR)/' - #$(INSTALL) -m644 '$(1)/biosig4c++/libgdf.def' '$(HOST_LIBDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll.a' '$(HOST_LIBDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libgdf.dll' '$(HOST_BINDIR)/' - - - $(INSTALL) -m644 '$(1)/biosig4c++/physicalunits.h' '$(HOST_INCDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.a' '$(HOST_LIBDIR)/' - #$(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.def' '$(HOST_LIBDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll.a' '$(HOST_LIBDIR)/' - $(INSTALL) -m644 '$(1)/biosig4c++/libphysicalunits.dll' '$(HOST_BINDIR)/' - - if [ "$(MXE_WINDOWS_BUILD)" == "yes" ]; then \ - $(SED) -i '/^Libs:/ s/$$/ -liconv -lws2_32/' $(1)/biosig4c++/libbiosig.pc; \ - fi - $(INSTALL) -m644 '$(1)/biosig4c++/libbiosig.pc' '$(HOST_LIBDIR)/pkgconfig/' - - # install biosig4matlab - # $(INSTALL) -d $(HOST_PREFIX)/share/biosig/matlab - # cp -r '$(1)'/biosig4matlab/* $(HOST_PREFIX)/share/biosig/matlab/ -endef -
--- a/src/build-cmake.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/build-cmake.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := build-cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.18.4 -$(PKG)_CHECKSUM := 73ab5348c881f1a53c250b66848b6ee101c9fe1f +$(PKG)_VERSION := 3.20.1 +$(PKG)_CHECKSUM := b09b025c81f584653eabb5a459b2378abf42f3bd $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/build-gcc.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/build-gcc.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 9.3.0 -$(PKG)_CHECKSUM := b746688bf045a316fc92c3528138ad10d0822b6b +$(PKG)_VERSION := 10.2.0 +$(PKG)_CHECKSUM := 8de0aecd3a52bb92b43082df8a9256356d1f03be $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -32,6 +32,7 @@ --without-x \ --disable-win32-registry \ --enable-threads=posix + ifneq ($(TARGET),x86_64-w64-mingw32) $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ @@ -47,41 +48,48 @@ fi endef endif + + ifeq ($(OCTAVE_TARGET),default-octave) + # FIXME: Adapt condition when Octave 7 moves to stable or it is released. + $(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601 + endif + define $(PKG)_INSTALL_SYSTEM_HEADERS $($(PKG)_PRE_BUILD) # install mingw-w64 headers $(call PREPARE_PKG_SOURCE,mingw-w64,$(1)) mkdir '$(1).headers' cd '$(1).headers' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-headers/configure' \ - --host='$(TARGET)' \ - --prefix='$(HOST_PREFIX)' \ - --enable-sdk=all \ - --enable-idl \ - --enable-secure-api \ - $(mingw-w64-headers_CONFIGURE_OPTS) + --host='$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --enable-sdk=all \ + --enable-idl \ + --enable-secure-api \ + $($(PKG)_WINAPI_VERSION_FLAGS) \ + $(mingw-w64-headers_CONFIGURE_OPTS) $(MAKE) -C '$(1).headers' install endef + define $(PKG)_BUILD_SYSTEM_RUNTIME # build standalone gcc $(MAKE) -C '$(1).build' -j '$(JOBS)' all-gcc $(MAKE) -C '$(1).build' -j 1 install-gcc - # build mingw-w64-crt mkdir '$(1).crt-build' cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \ - --host='$(TARGET)' \ - --prefix='$(HOST_PREFIX)' \ - $(if $(filter $(TARGET), x86_64-w64-mingw32),--disable-lib32) \ - --with-sysroot='$(HOST_PREFIX)' + --host='$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + $(if $(filter $(TARGET), x86_64-w64-mingw32),--disable-lib32) \ + --with-sysroot='$(HOST_PREFIX)' $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' $(MAKE) -C '$(1).crt-build' -j 1 install # build posix threads mkdir '$(1).pthreads' cd '$(1).pthreads' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-libraries/winpthreads/configure' \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - --prefix='$(HOST_PREFIX)' \ - $(ENABLE_SHARED_OR_STATIC) + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1).pthreads' -j '$(JOBS)' || $(MAKE) -C '$(1).pthreads' -j '$(JOBS)' $(MAKE) -C '$(1).pthreads' -j 1 install endef
--- a/src/build-meson.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/build-meson.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,12 +3,12 @@ PKG := build-meson $(PKG)_IGNORE := -$(PKG)_VERSION := 0.54.3 -$(PKG)_CHECKSUM := 741e42a3c8237abe74eb9f189cd8978897ef144d +$(PKG)_VERSION := 0.56.2 +$(PKG)_CHECKSUM := 88f30be08c968b0b8b9d2c6d3fe950fecff2658f $(PKG)_SUBDIR := meson-$($(PKG)_VERSION) $(PKG)_FILE := meson-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/mesonbuild/meson/archive/$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := build-python3 build-ninja +$(PKG)_DEPS := build-python3 define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/build-ninja.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/build-ninja.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,12 +3,12 @@ PKG := build-ninja $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.0 -$(PKG)_CHECKSUM := 7134bca607e17238d272e281ce1cae05d04be970 +$(PKG)_VERSION := 1.10.2 +$(PKG)_CHECKSUM := 8d2e8c1c070c27fb9dc46b4a6345bbb1de7ccbaf $(PKG)_SUBDIR := ninja-$($(PKG)_VERSION) $(PKG)_FILE := ninja-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://codeload.github.com/ninja-build/ninja/tar.gz/v$($(PKG)_VERSION) -$(PKG)_DEPS := build-python3 +$(PKG)_URL := https://github.com/ninja-build/ninja/archive/refs/tags/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; @@ -16,8 +16,12 @@ endef define $(PKG)_BUILD - cd '$(1)' && $(PYTHON3) configure.py --bootstrap + mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_INSTALL_PREFIX='$(3)$(BUILD_TOOLS_PREFIX)' \ + -DBUILD_TESTING=Off - $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin' - $(INSTALL) -m755 '$(1)/ninja' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; + cmake --build '$(1)/.build' -j '$(JOBS)' + cmake --install '$(1)/.build' endef
--- a/src/build-octave.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/build-octave.mk Sun Apr 25 18:31:10 2021 +0200 @@ -58,11 +58,10 @@ --without-fltk --without-fontconfig --without-framework-opengl \ --without-freetype --without-glpk --without-hdf5 --without-klu \ --without-magick --without-opengl --without-openssl \ - --without-osmesa --without-portaudio --without-qhull \ - --without-qrupdate --without-qscintilla --without-qt \ - --without-sndfile --without-sundials_ida \ - --without-sundials_nvecserial --without-umfpack --without-x \ - --without-z + --without-portaudio --without-qhull --without-qrupdate\ + --without-qscintilla --without-qt --without-sndfile \ + --without-sundials_ida --without-sundials_nvecserial \ + --without-umfpack --without-x --without-z $($(PKG)_ENV_FLAGS) $(MAKE) -C '$(1)/.build' all -j '$(JOBS)' $($(PKG)_ENV_FLAGS) $(MAKE) -C '$(1)/.build' install
--- a/src/cmake.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/cmake.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.18.4 -$(PKG)_CHECKSUM := 73ab5348c881f1a53c250b66848b6ee101c9fe1f +$(PKG)_VERSION := 3.20.1 +$(PKG)_CHECKSUM := b09b025c81f584653eabb5a459b2378abf42f3bd $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/curl.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/curl.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.73.0 -$(PKG)_CHECKSUM := 3afb9616ad14c0a84c016bbc1704dc6d883e7c17 +$(PKG)_VERSION := 7.76.1 +$(PKG)_CHECKSUM := d38ab79ef7a6d92df91ca8dfcf9a5eaf7e25b725 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)
--- a/src/dcmtk-4-c++11-related-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -From: Boris Pek -Date: Thu, 05 May 2016 15:38:47 +0300 -Subject: [PATCH] fix build with GCC >= 6.x - -diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc ---- a/ofstd/libsrc/ofstd.cc -+++ b/ofstd/libsrc/ofstd.cc -@@ -175,7 +175,7 @@ - - - // some systems don't properly define isnan() --#ifdef HAVE_ISNAN -+#if defined(HAVE_ISNAN) && (__cplusplus < 201103L) - #ifndef HAVE_PROTOTYPE_ISNAN - extern "C" - {
--- a/src/dcmtk.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/dcmtk.mk Sun Apr 25 18:31:10 2021 +0200 @@ -23,14 +23,13 @@ cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --with-openssl \ + --without-openssl \ --with-libtiff \ --with-libpng \ --with-libxml \ --with-libxmlinc='$(HOST_PREFIX)' \ --with-zlib \ --without-libwrap \ - --without-openssl \ CXX='$(MXE_CXX)' \ RANLIB='$(MXE_RANLIB)' \ AR='$(MXE_AR)' \
--- a/src/default-octave.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/default-octave.mk Sun Apr 25 18:31:10 2021 +0200 @@ -117,6 +117,21 @@ $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4 endif +ifeq ($(MXE_SYSTEM),mingw) + # This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with + # double quoted paths. + $(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"' + ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) + $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"' + else + $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"' + endif +else + $(PKG)_CONFIGURE_CPPFLAGS := $(CONFIGURE_CPPFLAGS) + $(PKG)_CONFIGURE_LDFLAGS := $(CONFIGURE_LDFLAGS) +endif + + ifeq ($(MXE_SYSTEM),msvc) $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)' # - Enable atomic refcount (required for QtHandles) @@ -131,8 +146,13 @@ CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' else $(PKG)_PREFIX := '$(HOST_PREFIX)' - $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ - LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib' + ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ + LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"' + else + $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ + LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib' + endif endif ifeq ($(MXE_SYSTEM),mingw) @@ -174,7 +194,8 @@ mkdir '$(1)/.build' cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_CONFIGURE_CPPFLAGS) \ + $($(PKG)_CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$($(PKG)_PREFIX)' \ --disable-silent-rules \ @@ -200,6 +221,7 @@ if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \ cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ + cp '$(1)/.build/src/.libs/octave-svgconvert.exe' '$(3)$(HOST_BINDIR)'; \ if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
--- a/src/eigen.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/eigen.mk Sun Apr 25 18:31:10 2021 +0200 @@ -12,8 +12,8 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'https://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \ - $(GREP) 'eigen/get/' | \ - $(SED) -n 's,.*eigen/get/\(3[^>]*\)\.tar.*,\1,p' | \ + $(GREP) 'released!' | \ + $(SED) -n 's,.*>Eigen \([0-9.]*\) released!.*,\1,p' | \ head -1 endef
--- a/src/expat.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/expat.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.10 -$(PKG)_CHECKSUM := 0a9f06081d92ddea17b8b9f4086b3f68e337bf8f +$(PKG)_VERSION := 2.3.0 +$(PKG)_CHECKSUM := e17fc843abc43be34ce85e53a4ca00b7a1e6d612 $(PKG)_SUBDIR := expat-$($(PKG)_VERSION) $(PKG)_FILE := expat-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/fftw.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/fftw.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := fftw $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.8 -$(PKG)_CHECKSUM := 59831bd4b2705381ee395e54aa6e0069b10c3626 +$(PKG)_VERSION := 3.3.9 +$(PKG)_CHECKSUM := bf17b485417f0f6a896b8514a3813439fda075fc $(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) $(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE)
--- a/src/freetds.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/freetds.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.5 -$(PKG)_CHECKSUM := 50b326d67ca88269d95c129bac5ea5c6f11fee91 +$(PKG)_VERSION := 1.2.20 +$(PKG)_CHECKSUM := 51d8848f63b7ee248343b8fac7d643b422f40be8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
--- a/src/freetype.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/freetype.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.10.2 -$(PKG)_CHECKSUM := b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875 +$(PKG)_VERSION := 2.10.4 +$(PKG)_CHECKSUM := 0181862673f7216ad2b5074f95fc131209e30b27 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/gcc-gmp.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/gcc-gmp.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := gcc-gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.0 -$(PKG)_CHECKSUM := 5e9341d3807bc7505376f9ed9f5c1c6c57050aa6 +$(PKG)_VERSION := 6.2.1 +$(PKG)_CHECKSUM := 2dcf34d4a432dbe6cce1475a835d20fe44f75822 $(PKG)_SUBDIR := gmp-$($(PKG)_VERSION) $(PKG)_FILE := gmp-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gmplib.org/download/gmp/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdb-1-gnulib.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,281 @@ +From 361cb219351d8b7e39e1962fe77f40aa80657b27 Mon Sep 17 00:00:00 2001 +From: Andrew Burgess <andrew.burgess@embecosm.com> +Date: Tue, 6 Oct 2020 10:09:06 +0100 +Subject: [PATCH] gnulib: Ensure all libraries are used when building + gdb/gdbserver + +An issue was reported here related to building GDB on MinGW: + + https://sourceware.org/pipermail/gdb/2020-September/048927.html + +It was suggested here: + + https://sourceware.org/pipermail/gdb/2020-September/048931.html + +that the solution might be to make use of $(LIB_GETRANDOM), a variable +defined in the gnulib makefile, when linking GDB. + +In fact I think the issue is bigger than just LIB_GETRANDOM. When +using the script binutils-gdb/gnulib/update-gnulib.sh to reimport +gnulib there is a lot of output from gnulib's gnulib-tool. Part of +that output is this: + + You may need to use the following makefile variables when linking. + Use them in <program>_LDADD when linking a program, or + in <library>_a_LDFLAGS or <library>_la_LDFLAGS when linking a library. + $(FREXPL_LIBM) + $(FREXP_LIBM) + $(INET_NTOP_LIB) + $(LIBTHREAD) + $(LIB_GETLOGIN) + $(LIB_GETRANDOM) + $(LIB_HARD_LOCALE) + $(LIB_MBRTOWC) + $(LIB_SETLOCALE_NULL) + $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise + +What I think this is telling us is that we should be including the +value of all these variables on the link line for gdb and gdbserver. + +The problem though is that these variables are define in gnulib's +makefile, but are not (necessarily) defined in GDB's makefile. + +One solution would be to recreate the checks that gnulib performs in +order to recreate these variables in both gdb's and gdbserver's +makefile. Though this shouldn't be too hard, most (if not all) of +these checks are in the form macros defined in m4 files in the gnulib +tree, so we could just reference these as needed. However, in this +commit I propose a different solution. + +Currently, in the top level makefile, we give gdb and gdbserver a +dependency on gnulib. Once gnulib has finished building gdb and +gdbserver can start, these projects then have a hard coded (relative) +path to the compiled gnulib library in their makefiles. + +In this commit I extend the gnulib configure script to install a new +makefile fragment in the gnulib build directory. This new file will +have the usual variable substitutions applied to it, and so can +include the complete list (see above) of all the extra libraries that +are needed when linking against gnulib. + +In fact the new makefile fragment defines three variables, these are: + +LIBGNU: The path to the archive containing gnulib. Can be used as a + dependency as when this file changes gdb/gdbserver should be + relinked. + +LIBGNU_EXTRA_LIBS: A list of linker -l.... flags that should be + included in the link line of gdb/gdbserver. These are + libraries that $(LIBGNU) depends on. This list is taken from + the output of gnulib-tool, which is run by our + gnulib/update-gnulib.sh script. + +INCGNU: A list of -I.... include paths that should be passed to the + compiler, these are where the gnulib headers can be found. + +Now both gdb and gdbserver can include the makefile fragment and make +use of these variables. + +The makefile fragment relies on the variable GNULIB_BUILDDIR being +defined. This is checked for in the fragment, and was already defined +in the makefiles of gdb and gdbserver. + +gdb/ChangeLog: + + * Makefile.in: Include Makefile.gnulib.inc. Don't define LIBGNU + or INCGNU. Make use of LIBGNU_EXTRA_LIBS when linking. + +gdbserver/ChangeLog: + + * Makefile.in: Include Makefile.gnulib.inc. Don't define LIBGNU + or INCGNU. Make use of LIBGNU_EXTRA_LIBS when linking. + +gnulib/ChangeLog: + + * Makefile.gnulib.inc.in: New file. + * Makefile.in: Regenerate. + * configure: Regenerate. + * configure.ac: Install the new file. +--- + gdb/ChangeLog | 5 ++++ + gdb/Makefile.in | 5 ++-- + gdbserver/ChangeLog | 5 ++++ + gdbserver/Makefile.in | 11 ++++----- + gnulib/ChangeLog | 7 ++++++ + gnulib/Makefile.gnulib.inc.in | 44 +++++++++++++++++++++++++++++++++++ + gnulib/Makefile.in | 4 +++- + gnulib/configure | 4 ++++ + gnulib/configure.ac | 2 ++ + 9 files changed, 77 insertions(+), 10 deletions(-) + create mode 100644 gnulib/Makefile.gnulib.inc.in + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 80b788cdff9..5f92e8781e7 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -243,8 +243,7 @@ GDBFLAGS = + + # Helper code from gnulib. + GNULIB_BUILDDIR = ../gnulib +-LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a +-INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import ++include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc + + SUPPORT = ../gdbsupport + LIBSUPPORT = $(SUPPORT)/libgdbsupport.a +@@ -632,7 +631,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) \ + $(XM_CLIBS) $(GDBTKLIBS) \ + @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \ + $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \ +- $(WIN32LIBS) $(LIBGNU) $(LIBICONV) \ ++ $(WIN32LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) $(LIBICONV) \ + $(LIBMPFR) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ + $(DEBUGINFOD_LIBS) + CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index c8cfed4819b..1969ed0ec37 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -114,8 +114,7 @@ ustinc = @ustinc@ + + # gnulib + GNULIB_BUILDDIR = ../gnulib +-LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a +-INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import ++include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc + + # Where is the INTL library? Typically in ../intl. + INTL = @LIBINTL@ +@@ -360,8 +359,8 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ + $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ + -o gdbserver$(EXEEXT) $(OBS) $(GDBSUPPORT) $(LIBGNU) \ +- $(LIBIBERTY) $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) \ +- $(WIN32APILIBS) ++ $(LIBGNU_EXTRA_LIBS) $(LIBIBERTY) $(INTL) \ ++ $(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS) + + gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ + $(INTL_DEPS) $(GDBSUPPORT) +@@ -369,8 +368,8 @@ gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ + $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ + -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) \ +- $(GDBSUPPORT) $(LIBGNU) $(LIBIBERTY) $(INTL) \ +- $(WIN32APILIBS) ++ $(GDBSUPPORT) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) \ ++ $(LIBIBERTY) $(INTL) $(WIN32APILIBS) + + IPA_OBJS = \ + alloc-ipa.o \ +diff --git a/gnulib/Makefile.gnulib.inc.in b/gnulib/Makefile.gnulib.inc.in +new file mode 100644 +index 00000000000..f3fd72b5781 +--- /dev/null ++++ b/gnulib/Makefile.gnulib.inc.in +@@ -0,0 +1,44 @@ ++# Copyright (C) 2020 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++# A makefile snippet that lists all of the libraries that should be ++# pulled in when linking against gnulib. Both GDB and GDBSERVER will ++# include this snippet. ++# ++# The defined variables are: ++# ++# LIBGNU: The path to the archive containing gnulib. Can be used as a ++# dependency as when this file changes gdb/gdbserver should be ++# relinked. ++# ++# LIBGNU_EXTRA_LIBS: A list of linker -l.... flags that should be ++# included in the link line of gdb/gdbserver. These are ++# libraries that $(LIBGNU) depends on. This list is taken from ++# the output of gnulib-tool, which is run by our ++# gnulib/update-gnulib.sh script. ++# ++# INCGNU: A list of -I.... include paths that should be passed to the ++# compiler, these are where the gnulib headers can be found. ++ ++ifndef GNULIB_BUILDDIR ++$(error missing GNULIB_BUILDDIR) ++endif ++ ++LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a ++LIBGNU_EXTRA_LIBS = @FREXPL_LIBM@ @FREXP_LIBM@ @INET_NTOP_LIB@ \ ++ @LIBTHREAD@ @LIB_GETLOGIN@ @LIB_GETRANDOM@ \ ++ @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ \ ++ @LIB_SETLOCALE_NULL@ @LIBINTL@ ++INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import +diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in +index bdd3c3f3fbc..c1c21680944 100644 +--- a/gnulib/Makefile.in ++++ b/gnulib/Makefile.in +@@ -277,7 +277,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_FILES = Makefile.gnulib.inc + CONFIG_CLEAN_VPATH_FILES = + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +@@ -1642,6 +1642,8 @@ $(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + + distclean-hdr: + -rm -f config.h stamp-h1 ++Makefile.gnulib.inc: $(top_builddir)/config.status $(srcdir)/Makefile.gnulib.inc.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ + + # This directory's subdirectories are mostly independent; you can cd + # into them and run 'make' without going through this Makefile. +diff --git a/gnulib/configure b/gnulib/configure +index 5c6add6e371..6c58a46e42e 100644 +--- a/gnulib/configure ++++ b/gnulib/configure +@@ -30802,6 +30802,9 @@ fi + # Checks for libraries. # + # ---------------------- # + ++ac_config_files="$ac_config_files Makefile.gnulib.inc" ++ ++ + ac_config_files="$ac_config_files Makefile import/Makefile" + + ac_config_commands="$ac_config_commands default" +@@ -31634,6 +31637,7 @@ do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "Makefile.gnulib.inc") CONFIG_FILES="$CONFIG_FILES Makefile.gnulib.inc" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "import/Makefile") CONFIG_FILES="$CONFIG_FILES import/Makefile" ;; + "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; +diff --git a/gnulib/configure.ac b/gnulib/configure.ac +index acc1b1a322e..052b8bd8dc5 100644 +--- a/gnulib/configure.ac ++++ b/gnulib/configure.ac +@@ -56,6 +56,8 @@ AC_CHECK_TOOL(AR, ar) + # Checks for libraries. # + # ---------------------- # + ++AC_CONFIG_FILES(Makefile.gnulib.inc) ++ + AC_OUTPUT(Makefile import/Makefile, + [ + case x$CONFIG_HEADERS in +-- +2.27.0 + +
--- a/src/gdb.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/gdb.mk Sun Apr 25 18:31:10 2021 +0200 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 9.2 -$(PKG)_CHECKSUM := 356ee474a24bfb2f133894730916557dfea9da2e +$(PKG)_VERSION := 10.1 +$(PKG)_CHECKSUM := c625efd87116525fb3bbeca7eaa1028ee62c0e7d $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdcm-2-getopt.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,16 @@ +--- gdcm-3.0.8/Utilities/getopt/getopt.h.orig 2020-10-13 09:40:48.964337600 +0300 ++++ gdcm-3.0.8/Utilities/getopt/getopt.h 2020-10-13 09:40:38.576190500 +0300 +@@ -67,13 +67,7 @@ + #define GETOPT_EXPORT + #endif /*defined(WIN32)*/ + +-#if defined(_WIN32) && defined(GETOPT_DLL) +- #if defined(gdcmgetopt_EXPORTS) +- #define GETOPT_EXTERN __declspec( dllexport ) +- #else +- #define GETOPT_EXTERN __declspec( dllimport ) +- #endif +-#else ++#if defined(_WIN32) + #define GETOPT_EXTERN extern + #endif /*defined(WIN32)*/
--- a/src/geos.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/geos.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := geos $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1 -$(PKG)_CHECKSUM := dbd165752dd4c48d81a84aa51c99d04410d96c67 +$(PKG)_VERSION := 3.9.1 +$(PKG)_CHECKSUM := 26e654352f6a953b75ff0e89c1c421343e051d3a $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE)
--- a/src/ghostscript-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/ghostscript-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,40 +1,20 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: darealshinji <djcj@gmx.de> -Date: Mon, 3 Dec 2018 21:05:41 +0100 -Subject: [PATCH 1/1] cross-build fixes, hide libgs symbols - - -diff --git a/Makefile.in b/Makefile.in -index 1111111..2222222 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -173,6 +173,9 @@ CAPOPT= @HAVE_MKSTEMP@ @HAVE_FILE64@ @HAVE_FSEEKO@ @HAVE_MKSTEMP64@ @HAVE_FONTCO +diff -ur ghostscript-9.50.orig/base/fapi_ft.c ghostscript-9.50/base/fapi_ft.c +--- ghostscript-9.50.orig/base/fapi_ft.c 2020-12-27 14:29:32.714236780 -0500 ++++ ghostscript-9.50/base/fapi_ft.c 2020-12-27 14:30:34.503600642 -0500 +@@ -125,6 +125,10 @@ + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); - GS=@GS@ - GS_SO_BASE=@GS@ -+GS_SONAME=@GS_SONAME@ -+GS_SONAME_MAJOR=@GS_SONAME_MAJOR@ -+GS_SONAME_MAJOR_MINOR=@GS_SONAME_MAJOR_MINOR@ - - PCL=@PCL@ - PCL_SO_BASE=@PCL@ -@@ -184,7 +187,7 @@ GPDL=@GPDL@ - GPDL_SO_BASE=@GPDL@ - - XE=@EXEEXT@ --XEAUX=@EXEEXT@ -+XEAUX=@AUXEXEEXT@ - - PCL_TARGET=@PCL_TARGET@ - XPS_TARGET=@XPS_TARGET@ -diff --git a/base/gp_unix.c b/base/gp_unix.c -index 1111111..2222222 100644 ---- a/base/gp_unix.c -+++ b/base/gp_unix.c ++#ifndef FT_CALLBACK_DEF ++ #define FT_CALLBACK_DEF(X) X ++#endif ++ + FT_CALLBACK_DEF(void *) + FF_alloc(FT_Memory memory, long size) + { +diff -ur ghostscript-9.50.orig/base/gp_unix.c ghostscript-9.50/base/gp_unix.c +--- ghostscript-9.50.orig/base/gp_unix.c 2020-12-27 14:29:32.703236181 -0500 ++++ ghostscript-9.50/base/gp_unix.c 2020-12-27 18:25:25.242079971 -0500 @@ -16,6 +16,9 @@ /* Unix-specific routines for Ghostscript */ @@ -45,7 +25,7 @@ #include "pipe_.h" #include "string_.h" #include "time_.h" -@@ -454,3 +457,54 @@ void gp_enumerate_fonts_free(void *enum_state) +@@ -466,3 +469,54 @@ } #endif } @@ -100,11 +80,11 @@ + return unicode[0]; +} +#endif /* __MINGW32__ */ -diff --git a/base/unix-aux.mak b/base/unix-aux.mak -index 1111111..2222222 100644 ---- a/base/unix-aux.mak -+++ b/base/unix-aux.mak -@@ -57,23 +57,29 @@ $(AUX)gp_stdia.$(OBJ): $(GLSRC)gp_stdia.c $(AK)\ +Only in ghostscript-9.50/base: gp_unix.c.orig +diff -ur ghostscript-9.50.orig/base/unix-aux.mak ghostscript-9.50/base/unix-aux.mak +--- ghostscript-9.50.orig/base/unix-aux.mak 2020-12-27 14:29:32.718236997 -0500 ++++ ghostscript-9.50/base/unix-aux.mak 2020-12-27 18:25:25.242079971 -0500 +@@ -57,23 +57,29 @@ # -------------------------- Auxiliary programs --------------------------- # $(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) @@ -134,7 +114,7 @@ $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) # To get GS to use the system zlib, you remove/hide the gs/zlib directory -@@ -84,6 +90,7 @@ MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ +@@ -84,6 +90,7 @@ $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) $(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) @@ -142,7 +122,7 @@ $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) # .... and one using the zlib library linked via the command line -@@ -93,9 +100,11 @@ MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ +@@ -93,9 +100,11 @@ $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS) @@ -154,11 +134,10 @@ $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) # Query the environment to construct gconfig_.h. -diff --git a/base/unix-dll.mak b/base/unix-dll.mak -index 1111111..2222222 100644 ---- a/base/unix-dll.mak -+++ b/base/unix-dll.mak -@@ -66,9 +66,6 @@ GPDL_SONAME_BASE=lib$(GPDL_SO_BASE) +diff -ur ghostscript-9.50.orig/base/unix-dll.mak ghostscript-9.50/base/unix-dll.mak +--- ghostscript-9.50.orig/base/unix-dll.mak 2020-12-27 14:29:32.690235473 -0500 ++++ ghostscript-9.50/base/unix-dll.mak 2020-12-27 18:25:25.242079971 -0500 +@@ -66,9 +66,6 @@ GS_SOEXT=$(SO_LIB_EXT) GS_DLLEXT=$(DLL_EXT) @@ -168,11 +147,10 @@ PCL_SONAME=$(PCL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT) PCL_SONAME_MAJOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT) -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,6 +23,7 @@ AC_INIT +diff -ur ghostscript-9.50.orig/configure.ac ghostscript-9.50/configure.ac +--- ghostscript-9.50.orig/configure.ac 2020-12-27 14:29:32.689235419 -0500 ++++ ghostscript-9.50/configure.ac 2020-12-27 18:25:25.243080026 -0500 +@@ -23,6 +23,7 @@ AC_PREREQ(2.63) AC_LANG(C) AC_CONFIG_SRCDIR(psi/gs.c) @@ -180,7 +158,7 @@ dnl Inherit compiler flags from the environment... CFLAGS="${CFLAGS:=}" -@@ -125,8 +126,11 @@ AUXEXTRALIBSTMP="\$(EXTRALIBS)" +@@ -125,8 +126,11 @@ # purposefully do not include "help" output for this AC_ARG_ENABLE([save_confaux]) @@ -193,7 +171,7 @@ # rerun configure for the AUX tools, disabling a load of tests not relevant for CCAUX olddir=`pwd` if test x"$enable_save_confaux" = x"yes"; then -@@ -146,9 +150,10 @@ if test x"$CCAUX" != x"" ; then +@@ -146,9 +150,10 @@ echo $AUXFLAGS_MAK_LINE06 >> $AUXFLAGS_MAK.in echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in @@ -206,7 +184,7 @@ if test $status -eq 0 ; then CCAUX=$(grep CCAUX $AUXFLAGS_MAK | sed "s/CCAUX=//g") GCFLAGSAUXTMP=$(grep GCFLAGSAUX $AUXFLAGS_MAK | sed "s/GCFLAGSAUX=//g") -@@ -204,7 +209,7 @@ AC_PATH_TOOL(PKGCONFIG, pkg-config) +@@ -204,7 +209,7 @@ # but if we are cross compiling, and there isn't a matching # pkconfig for the --host setting, then don't use the 'local' # pkconfig at all @@ -215,7 +193,7 @@ AC_PATH_PROG(BUILD_PKGCONFIG, pkg-config) if test x"$BUILD_PKGCONFIG" = x"$PKGCONFIG" ; then PKGCONFIG= -@@ -217,7 +222,7 @@ AC_PATH_TOOL(STRIP_XE, strip) +@@ -217,7 +222,7 @@ # but if we are cross compiling, and there isn't a matching # pkconfig for the --host setting, then don't use the 'local' # pkconfig at all @@ -224,7 +202,7 @@ AC_PATH_PROG(BUILD_STRIP_XE, strip) if test x"$BUILD_STRIP_XE" = x"$STRIP_XE" ; then STRIP_XE= -@@ -234,18 +239,14 @@ CONTRIBINCLUDE="include $srcdir/contrib/contrib.mak" +@@ -234,18 +239,14 @@ INSTALL_CONTRIB="install-contrib-extras" if test x"$enable_contrib" = x; then @@ -245,7 +223,7 @@ fi if test x"$enable_contrib" != x"no"; then -@@ -274,26 +275,27 @@ dnl -------------------------------------------------- +@@ -274,26 +275,27 @@ CC_OPT_FLAGS_TO_TRY="-O" SET_DT_SONAME="-soname=" @@ -283,7 +261,7 @@ if test $ac_cv_prog_gcc = yes; then CC_OPT_FLAGS_TO_TRY="-O2" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" -@@ -321,7 +323,6 @@ else +@@ -321,7 +323,6 @@ fi ;; esac @@ -291,7 +269,7 @@ AC_SUBST(SET_DT_SONAME) -@@ -368,18 +369,20 @@ AC_ARG_WITH([arch_h], AC_HELP_STRING([--with-arch_h=<arch.h to use>], +@@ -368,18 +369,20 @@ ARCH_CONF_HEADER= if test x"$with_arch_h" = x""; then @@ -318,7 +296,7 @@ else ARCH_CONF_HEADER=$with_arch_h fi -@@ -658,15 +661,7 @@ dnl Set options that we want to pass into all other +@@ -658,15 +661,7 @@ dnl configure scripts we might call dnl -------------------------------------------------- @@ -335,7 +313,7 @@ dnl -------------------------------------------------- dnl Check for libraries -@@ -996,7 +991,7 @@ if test x"$enable_fapi" != xno; then +@@ -996,7 +991,7 @@ if $PKGCONFIG --atleast-version=12.0.6 freetype2; then AC_MSG_RESULT(yes) FT_CFLAGS="$CFLAGS `$PKGCONFIG --cflags freetype2`" @@ -344,7 +322,7 @@ FT_BRIDGE=1 SHARE_FT=1 else -@@ -1047,6 +1042,14 @@ AC_SUBST(FTSRCDIR) +@@ -1047,6 +1042,14 @@ AC_SUBST(FT_CFLAGS) AC_SUBST(FT_LIBS) @@ -359,7 +337,7 @@ AC_MSG_CHECKING([for local jpeg library source]) dnl At present, we give the local source priority over the shared dnl build, so that the D_MAX_BLOCKS_IN_MCU patch will be applied. -@@ -1088,6 +1091,13 @@ else +@@ -1088,6 +1091,13 @@ [define if the libjpeg memory system prototypes aren't available]) fi @@ -373,7 +351,7 @@ AC_MSG_CHECKING([for local zlib source]) dnl zlib is needed for language level 3, and libpng # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) -@@ -1096,6 +1106,13 @@ ZLIBDIR=src +@@ -1096,6 +1106,13 @@ AUX_SHARED_ZLIB= ZLIBCFLAGS="" @@ -387,7 +365,7 @@ if test -d $srcdir/zlib; then AC_MSG_RESULT([yes]) SHARE_ZLIB=0 -@@ -1110,6 +1127,9 @@ else +@@ -1110,6 +1127,9 @@ AC_CHECK_HEADERS(zlib.h, [SHARE_ZLIB=1; AUX_SHARED_ZLIB="-l\$(ZLIB_NAME)"]) ]) fi @@ -397,7 +375,7 @@ if test -z "$SHARE_ZLIB"; then AC_MSG_ERROR([I did not find a copy of zlib on your system. Please either install it, or unpack a copy of the source in a -@@ -1136,6 +1156,11 @@ AC_SUBST(ZLIBDIR) +@@ -1136,6 +1156,11 @@ AC_SUBST(FT_SYS_ZLIB) dnl png for the png output device; it also requires zlib @@ -409,7 +387,7 @@ LIBPNGDIR=src PNGDEVS='' PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' -@@ -1157,12 +1182,21 @@ fi +@@ -1157,12 +1182,21 @@ if test -z "$PNGDEVS"; then AC_MSG_NOTICE([disabling png output devices]) fi @@ -431,7 +409,7 @@ AC_MSG_CHECKING([for local lcms2mt library source]) LCMS2DIR=src LCMS2MTDIR=src -@@ -1197,6 +1231,8 @@ else +@@ -1197,6 +1231,8 @@ fi fi @@ -440,7 +418,7 @@ AC_SUBST(SHARELCMS) AC_SUBST(WHICHLCMS) AC_SUBST(LCMS2DIR) -@@ -1349,7 +1385,7 @@ EXPATDIR=src +@@ -1349,7 +1385,7 @@ EXPAT_CFLAGS= EXPAT_LIBS= @@ -449,7 +427,7 @@ if test -f $srcdir/xps/xps.mak; then AC_MSG_CHECKING([for local expat library source]) if test -f $srcdir/expat/lib/expat.h ; then -@@ -1528,16 +1564,14 @@ dnl look for IJS implementation +@@ -1528,16 +1564,14 @@ AC_ARG_WITH([ijs], AC_HELP_STRING([--without-ijs], [disable IJS driver support])) @@ -468,7 +446,7 @@ dnl set safe defaults IJSDIR=src -@@ -1589,15 +1623,8 @@ if test x$with_luratech != xno; then +@@ -1589,15 +1623,8 @@ SHARE_JBIG2=0 JBIG2DIR=$srcdir/luratech/ldf_jb2 @@ -486,7 +464,7 @@ JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -DMAC -DMAC_OS_X_BUILD -fsigned-char" ;; AIX) -@@ -1611,7 +1638,6 @@ if test x$with_luratech != xno; then +@@ -1611,7 +1638,6 @@ JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -fsigned-char -DLINUX=1 -DFORTE" ;; esac @@ -494,7 +472,7 @@ JBIG2FILEDEVS='$(DD)gdevjbig2.dev' JBIG2DEVS='$(PSD)jbig2.dev' -@@ -1718,15 +1744,8 @@ if test x$with_luratech != xno; then +@@ -1734,15 +1760,8 @@ SHARE_JPX=0 JPXDIR=$srcdir/luratech/lwf_jp2 @@ -512,7 +490,7 @@ JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DMAC -DMAC_OS_X_BUILD" ;; AIX) -@@ -1740,7 +1759,6 @@ if test x$with_luratech != xno; then +@@ -1756,7 +1775,6 @@ JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DLINUX=1 -DFORTE" ;; esac @@ -520,7 +498,7 @@ JPXDEVS='$(PSD)jpx.dev' else AC_MSG_RESULT([no]) -@@ -2357,22 +2375,15 @@ SO_LIB_EXT=".so" +@@ -2506,22 +2524,15 @@ DLL_EXT="" SO_LIB_VERSION_SEPARATOR="." @@ -552,7 +530,7 @@ DYNAMIC_CFLAGS="-fPIC" GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)" PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)" -@@ -2386,17 +2397,21 @@ else +@@ -2535,17 +2546,21 @@ fi SO_LIB_EXT=".so" ;; @@ -578,7 +556,7 @@ DYNAMIC_CFLAGS="-fPIC" GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)" PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)" -@@ -2404,7 +2419,7 @@ else +@@ -2553,7 +2568,7 @@ DYNAMIC_LIBS="" SO_LIB_EXT=".so" ;; @@ -587,7 +565,7 @@ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)" PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)" XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)" -@@ -2442,15 +2457,18 @@ else +@@ -2591,15 +2606,18 @@ fi SO_LIB_EXT=".so" ;; @@ -610,7 +588,7 @@ INSTALL_SHARED="install-shared" if test "x$X_DEVS" != x; then DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -@@ -2462,14 +2480,14 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING([--enable-dynamic], +@@ -2611,14 +2629,14 @@ OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" ;; @@ -627,7 +605,7 @@ INSTALL_SHARED="install-shared" DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" X11_DEVS="" -@@ -2814,23 +2832,31 @@ AC_SUBST(AUXDIRPOSTFIX) +@@ -2963,23 +2981,31 @@ # usually empty on Unix-like systems # -------------------------------------------------- EXEEXT="" @@ -671,7 +649,7 @@ # -------------------------------------------------- # Check for disabling of versioned path option. -@@ -2885,7 +2911,7 @@ fi +@@ -3034,7 +3060,7 @@ AC_SUBST(CLUSTER_CFLAGS) @@ -680,7 +658,7 @@ ilog2() { -@@ -3025,7 +3051,7 @@ AC_SUBST(AUXEXTRALIBS) +@@ -3174,7 +3200,7 @@ CONFIG_FILES_LIST="$CONFIG_FILES_LIST $THEMAKEFILE" @@ -689,19 +667,27 @@ CONFIG_FILES_LIST="$CONFIG_FILES_LIST" fi -diff --git a/psi/iapi.h b/psi/iapi.h -index 1111111..2222222 100644 ---- a/psi/iapi.h -+++ b/psi/iapi.h -@@ -68,6 +68,11 @@ extern "C" { - # define GSDLLEXPORT - # endif - # endif -+# ifdef __MINGW32__ -+/* export stdcall functions as "name" instead of "_name@ordinal" */ -+# undef GSDLLAPI -+# define GSDLLAPI -+# endif - # ifndef GSDLLAPI - # define GSDLLAPI __stdcall -# endif +Only in ghostscript-9.50: configure.ac.orig +diff -ur ghostscript-9.50.orig/Makefile.in ghostscript-9.50/Makefile.in +--- ghostscript-9.50.orig/Makefile.in 2020-12-27 14:29:32.689235419 -0500 ++++ ghostscript-9.50/Makefile.in 2020-12-27 18:25:25.241079917 -0500 +@@ -172,6 +172,9 @@ + + GS=@GS@ + GS_SO_BASE=@GS@ ++GS_SONAME=@GS_SONAME@ ++GS_SONAME_MAJOR=@GS_SONAME_MAJOR@ ++GS_SONAME_MAJOR_MINOR=@GS_SONAME_MAJOR_MINOR@ + + PCL=@PCL@ + PCL_SO_BASE=@PCL@ +@@ -183,7 +186,7 @@ + GPDL_SO_BASE=@GPDL@ + + XE=@EXEEXT@ +-XEAUX=@EXEEXT@ ++XEAUX=@AUXEXEEXT@ + + PCL_TARGET=@PCL_TARGET@ + XPS_TARGET=@XPS_TARGET@ +Only in ghostscript-9.50: Makefile.in.orig
--- a/src/glib-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/glib-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -165,7 +165,7 @@ Requires.private: gmodule-no-export-2.0 -Libs: -L${libdir} -lgio-2.0 +Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi - Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ + Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@ Cflags: From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 @@ -179,73 +179,65 @@ index 1111111..2222222 100644 --- a/glib/gmain.c +++ b/glib/gmain.c -@@ -2657,12 +2657,15 @@ g_get_real_time (void) - #if defined (G_OS_WIN32) - static ULONGLONG (*g_GetTickCount64) (void) = NULL; - static guint32 g_win32_tick_epoch = 0; +@@ -2688,12 +2688,15 @@ g_get_real_time (void) + * So for now we calculate (usec_per_sec / ticks_per_sec) and use floating point + */ + static gdouble g_monotonic_usec_per_tick = 0; +static gboolean g_win32_clock_is_initialized; void g_clock_win32_init (void) { - HMODULE kernel32; + LARGE_INTEGER freq; + g_win32_clock_is_initialized = TRUE; + - g_GetTickCount64 = NULL; - kernel32 = GetModuleHandle ("KERNEL32.DLL"); - if (kernel32 != NULL) -@@ -2721,6 +2724,9 @@ g_get_monotonic_time (void) - * timeBeginPeriod() to increase it as much as they want - */ - + if (!QueryPerformanceFrequency (&freq) || freq.QuadPart == 0) + { + /* The documentation says that this should never happen */ +@@ -2707,6 +2709,9 @@ g_get_monotonic_time (void) + gint64 + g_get_monotonic_time (void) + { + if (!g_win32_clock_is_initialized) + g_clock_win32_init (); + - if (g_GetTickCount64 != NULL) + if (G_LIKELY (g_monotonic_usec_per_tick != 0)) { - guint32 ticks_as_32bit; + LARGE_INTEGER ticks; diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c index 1111111..2222222 100644 --- a/glib/gthread-win32.c +++ b/glib/gthread-win32.c -@@ -116,18 +116,28 @@ typedef struct - void (__stdcall * WakeConditionVariable) (gpointer cond); - } GThreadImplVtable; - +@@ -60,6 +60,10 @@ g_thread_abort (gint status, + strerror (status), function); + g_abort (); + } +/* Needed for static builds where DllMain initializer doesn't get called */ +static gboolean g_threads_is_initialized; +G_GNUC_INTERNAL void g_thread_win32_init (void); + - static GThreadImplVtable g_thread_impl_vtable; - /* {{{1 GMutex */ + /* Starting with Vista and Windows 2008, we have access to the + * CONDITION_VARIABLE and SRWLock primatives on Windows, which are +@@ -79,6 +83,9 @@ g_thread_abort (gint status, void g_mutex_init (GMutex *mutex) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.InitializeSRWLock (mutex); + InitializeSRWLock ((gpointer) mutex); } - void - g_mutex_clear (GMutex *mutex) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - if (g_thread_impl_vtable.DeleteSRWLock != NULL) - g_thread_impl_vtable.DeleteSRWLock (mutex); - } -@@ -135,18 +145,27 @@ g_mutex_clear (GMutex *mutex) +@@ -90,18 +97,27 @@ g_mutex_clear (GMutex *mutex) void g_mutex_lock (GMutex *mutex) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.AcquireSRWLockExclusive (mutex); + AcquireSRWLockExclusive ((gpointer) mutex); } gboolean @@ -254,7 +246,7 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex); + return TryAcquireSRWLockExclusive ((gpointer) mutex); } void @@ -263,10 +255,10 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex); + ReleaseSRWLockExclusive ((gpointer) mutex); } -@@ -157,6 +176,9 @@ g_rec_mutex_impl_new (void) +@@ -112,6 +128,9 @@ g_rec_mutex_impl_new (void) { CRITICAL_SECTION *cs; @@ -276,7 +268,7 @@ cs = g_slice_new (CRITICAL_SECTION); InitializeCriticalSection (cs); -@@ -167,6 +189,10 @@ static void +@@ -122,6 +141,10 @@ static void g_rec_mutex_impl_free (CRITICAL_SECTION *cs) { DeleteCriticalSection (cs); @@ -287,7 +279,7 @@ g_slice_free (CRITICAL_SECTION, cs); } -@@ -175,6 +201,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex) +@@ -130,6 +153,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex) { CRITICAL_SECTION *impl = mutex->p; @@ -297,7 +289,7 @@ if G_UNLIKELY (mutex->p == NULL) { impl = g_rec_mutex_impl_new (); -@@ -189,30 +218,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex) +@@ -144,30 +170,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex) void g_rec_mutex_init (GRecMutex *mutex) { @@ -343,33 +335,24 @@ return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex)); } -@@ -221,12 +265,18 @@ g_rec_mutex_trylock (GRecMutex *mutex) +@@ -176,6 +217,9 @@ g_rec_mutex_trylock (GRecMutex *mutex) void g_rw_lock_init (GRWLock *lock) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.InitializeSRWLock (lock); + InitializeSRWLock ((gpointer) lock); } - void - g_rw_lock_clear (GRWLock *lock) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - if (g_thread_impl_vtable.DeleteSRWLock != NULL) - g_thread_impl_vtable.DeleteSRWLock (lock); - } -@@ -234,36 +284,54 @@ g_rw_lock_clear (GRWLock *lock) +@@ -187,36 +231,54 @@ g_rw_lock_clear (GRWLock *lock) void g_rw_lock_writer_lock (GRWLock *lock) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.AcquireSRWLockExclusive (lock); + AcquireSRWLockExclusive ((gpointer) lock); } gboolean @@ -378,7 +361,7 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock); + return TryAcquireSRWLockExclusive ((gpointer) lock); } void @@ -387,7 +370,7 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.ReleaseSRWLockExclusive (lock); + ReleaseSRWLockExclusive ((gpointer) lock); } void @@ -396,7 +379,7 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.AcquireSRWLockShared (lock); + AcquireSRWLockShared ((gpointer) lock); } gboolean @@ -405,7 +388,7 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - return g_thread_impl_vtable.TryAcquireSRWLockShared (lock); + return TryAcquireSRWLockShared ((gpointer) lock); } void @@ -414,36 +397,27 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.ReleaseSRWLockShared (lock); + ReleaseSRWLockShared ((gpointer) lock); } -@@ -271,12 +339,18 @@ g_rw_lock_reader_unlock (GRWLock *lock) +@@ -224,6 +286,9 @@ g_rw_lock_reader_unlock (GRWLock *lock) void g_cond_init (GCond *cond) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.InitializeConditionVariable (cond); + InitializeConditionVariable ((gpointer) cond); } - void - g_cond_clear (GCond *cond) - { -+ if (!g_threads_is_initialized) -+ g_thread_win32_init (); -+ - if (g_thread_impl_vtable.DeleteConditionVariable) - g_thread_impl_vtable.DeleteConditionVariable (cond); - } -@@ -284,12 +358,18 @@ g_cond_clear (GCond *cond) +@@ -235,12 +300,18 @@ g_cond_clear (GCond *cond) void g_cond_signal (GCond *cond) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.WakeConditionVariable (cond); + WakeConditionVariable ((gpointer) cond); } void @@ -452,30 +426,30 @@ + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.WakeAllConditionVariable (cond); + WakeAllConditionVariable ((gpointer) cond); } -@@ -297,6 +377,9 @@ void +@@ -248,6 +319,9 @@ void g_cond_wait (GCond *cond, GMutex *entered_mutex) { + if (!g_threads_is_initialized) + g_thread_win32_init (); + - g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0); + SleepConditionVariableSRW ((gpointer) cond, (gpointer) entered_mutex, INFINITE, 0); } -@@ -307,6 +390,9 @@ g_cond_wait_until (GCond *cond, - { - gint64 span; +@@ -260,6 +334,9 @@ g_cond_wait_until (GCond *cond, + DWORD span_millis; + gboolean signalled; + if (!g_threads_is_initialized) + g_thread_win32_init (); + - span = end_time - g_get_monotonic_time (); - - if G_UNLIKELY (span < 0) -@@ -339,6 +425,9 @@ g_private_get_impl (GPrivate *key) + start_time = g_get_monotonic_time (); + do + { +@@ -311,6 +388,9 @@ g_private_get_impl (GPrivate *key) if G_UNLIKELY (impl == 0) { @@ -485,7 +459,7 @@ EnterCriticalSection (&g_private_lock); impl = (DWORD) key->p; if (impl == 0) -@@ -432,6 +521,9 @@ g_system_thread_free (GRealThread *thread) +@@ -404,6 +484,9 @@ g_system_thread_free (GRealThread *thread) { GThreadWin32 *wt = (GThreadWin32 *) thread; @@ -495,7 +469,7 @@ win32_check_for_error (CloseHandle (wt->handle)); g_slice_free (GThreadWin32, wt); } -@@ -439,6 +531,9 @@ g_system_thread_free (GRealThread *thread) +@@ -411,6 +494,9 @@ g_system_thread_free (GRealThread *thread) void g_system_thread_exit (void) { @@ -505,7 +479,7 @@ _endthreadex (0); } -@@ -447,6 +542,9 @@ g_thread_win32_proxy (gpointer data) +@@ -419,6 +505,9 @@ g_thread_win32_proxy (gpointer data) { GThreadWin32 *self = data; @@ -515,7 +489,7 @@ self->proxy (self); g_system_thread_exit (); -@@ -464,6 +562,9 @@ g_system_thread_new (GThreadFunc func, +@@ -436,6 +525,9 @@ g_system_thread_new (GThreadFunc func, GThreadWin32 *thread; guint ignore; @@ -525,7 +499,7 @@ thread = g_slice_new0 (GThreadWin32); thread->proxy = func; -@@ -493,6 +594,9 @@ g_system_thread_wait (GRealThread *thread) +@@ -465,6 +557,9 @@ g_system_thread_wait (GRealThread *thread) { GThreadWin32 *wt = (GThreadWin32 *) thread; @@ -535,15 +509,16 @@ win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE)); } -@@ -1041,6 +1145,8 @@ g_thread_lookup_native_funcs (void) +@@ -536,6 +631,8 @@ g_system_thread_set_name (const gchar *name) void g_thread_win32_init (void) { + g_threads_is_initialized = TRUE; + - if (!g_thread_lookup_native_funcs ()) - g_thread_xp_init (); + InitializeCriticalSection (&g_private_lock); + #ifndef _MSC_VER + From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gerardo Ballabio <gerardo.ballabio@gmail.com> @@ -597,52 +572,6 @@ dnl definitions in terms of our private definitions. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Mon, 26 Feb 2018 16:09:53 +1100 -Subject: [PATCH 9/9] darwin: disable g_cocoa_notification_backend - - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 1111111..2222222 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -279,10 +279,6 @@ unix_sources = \ - - appinfo_sources += $(unix_appinfo_sources) - --if OS_COCOA --unix_sources += gcocoanotificationbackend.c --endif -- - giounixincludedir=$(includedir)/gio-unix-2.0/gio - giounixinclude_HEADERS = \ - gdesktopappinfo.h \ -diff --git a/gio/giomodule.c b/gio/giomodule.c -index 1111111..2222222 100644 ---- a/gio/giomodule.c -+++ b/gio/giomodule.c -@@ -918,9 +918,6 @@ extern GType g_proxy_resolver_portal_get_type (void); - extern GType g_network_monitor_portal_get_type (void); - #endif - --#ifdef HAVE_COCOA --extern GType g_cocoa_notification_backend_get_type (void); --#endif - - #ifdef G_PLATFORM_WIN32 - -@@ -1117,9 +1114,6 @@ _g_io_modules_ensure_loaded (void) - g_type_ensure (g_network_monitor_portal_get_type ()); - g_type_ensure (g_proxy_resolver_portal_get_type ()); - #endif --#ifdef HAVE_COCOA -- g_type_ensure (g_cocoa_notification_backend_get_type ()); --#endif - #ifdef G_OS_WIN32 - g_type_ensure (_g_winhttp_vfs_get_type ()); -#endif - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik <ekulik@redhat.com> Date: Tue, 29 Jan 2019 09:50:46 +0100 Subject: [PATCH 10/10] gdbus: Avoid printing null strings @@ -692,7 +621,7 @@ g_set_error (error, @@ -2703,10 +2702,10 @@ g_dbus_message_to_blob (GDBusMessage *message, G_IO_ERROR_INVALID_ARGUMENT, - _("Message body has signature '%s' but there is no signature header"), + _("Message body has signature “%s” but there is no signature header"), signature_str); - g_free (tupled_signature_str); goto out;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-2-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,24 @@ +See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1428 + +--- a/glib/gtypes.h 2016-10-22 07:21:52.000000000 +0200 ++++ b/glib/gtypes.h 2020-05-17 11:13:49.369639688 +0200 +@@ -522,7 +522,7 @@ + # else /* !GLIB_STATIC_COMPILATION */ + # ifdef GLIB_COMPILATION + # ifdef DLL_EXPORT +-# define GLIB_VAR __declspec(dllexport) ++# define GLIB_VAR extern __declspec(dllexport) + # else /* !DLL_EXPORT */ + # define GLIB_VAR extern + # endif /* !DLL_EXPORT */ +--- a/gobject/gparamspecs.h 2016-10-22 07:22:21.000000000 +0200 ++++ b/gobject/gparamspecs.h 2020-05-17 11:16:37.803281391 +0200 +@@ -1144,7 +1144,7 @@ + # else /* !GOBJECT_STATIC_COMPILATION */ + # ifdef GOBJECT_COMPILATION + # ifdef DLL_EXPORT +-# define GOBJECT_VAR __declspec(dllexport) ++# define GOBJECT_VAR extern __declspec(dllexport) + # else /* !DLL_EXPORT */ + # define GOBJECT_VAR extern + # endif /* !DLL_EXPORT */
--- a/src/glib.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/glib.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.50.2 -$(PKG)_CHECKSUM := 948a768931ca321a35e16556a1c8adcae04babf2 +$(PKG)_VERSION := 2.58.0 +$(PKG)_CHECKSUM := c00e433c56e0ba3541abc5222aeca4136de10fb8 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) @@ -41,7 +41,8 @@ --disable-libmount \ --with-libiconv=gnu \ --with-pcre=internal \ - && $(CONFIGURE_POST_HOOK) + --disable-compile-warnings \ + && $(CONFIGURE_POST_HOOK) $(SED) -i 's,#define G_ATOMIC.*,,' '$(1)/config.h' $(MAKE) -C '$(1)/glib' -j '$(JOBS)' @@ -68,6 +69,7 @@ --with-pcre=system \ --with-libiconv=gnu \ --disable-inotify \ + --disable-compile-warnings \ PKG_CONFIG='$(MXE_PKG_CONFIG)' \ PKG_CONFIG_PATH='$(PKG_CONFIG_PATH)'
--- a/src/gmp.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/gmp.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.0 -$(PKG)_CHECKSUM := 5e9341d3807bc7505376f9ed9f5c1c6c57050aa6 +$(PKG)_VERSION := 6.2.1 +$(PKG)_CHECKSUM := 2dcf34d4a432dbe6cce1475a835d20fe44f75822 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gmplib.org/download/gmp/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/graphicsmagick-3-user32.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,71 @@ +diff -ur GraphicsMagick-1.3.36.orig/configure.ac GraphicsMagick-1.3.36/configure.ac +--- GraphicsMagick-1.3.36.orig/configure.ac 2021-01-01 09:35:17.966994198 -0500 ++++ GraphicsMagick-1.3.36/configure.ac 2021-01-01 14:21:04.736125338 -0500 +@@ -2752,7 +2752,8 @@ + found_libgdi32=0 + AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) + AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include <windows.h>]) +- AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,) ++ AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr $found_libuser32 + 1`],[],[]) ++ AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + 1`],[],[]) + if test $found_libgdi32 -gt 0 + then + passed=`expr $passed + 1` +@@ -2767,7 +2768,7 @@ + AC_MSG_RESULT([no -- some components failed test]) + have_gdi32='no (failed tests)' + else +- LIB_GDI32='-lgdi32' ++ LIB_GDI32='-lgdi32 -luser32' + LIBS="$LIB_GDI32 $LIBS" + AC_DEFINE([HasWINGDI32],[1],[Define to use the Windows GDI32 library]) + AC_MSG_RESULT([yes]) +diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.c GraphicsMagick-1.3.36/magick/nt_feature.c +--- GraphicsMagick-1.3.36.orig/magick/nt_feature.c 2021-01-01 09:35:18.045998572 -0500 ++++ GraphicsMagick-1.3.36/magick/nt_feature.c 2021-01-01 14:22:55.233205368 -0500 +@@ -78,6 +78,7 @@ + % + % + */ ++#if defined(HasWINGDI32) + MagickExport void *CropImageToHBITMAP(Image *image, + const RectangleInfo *geometry,ExceptionInfo *exception) + { +@@ -217,6 +218,7 @@ + + return (void *)bitmapH; + } ++#endif + + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +@@ -612,6 +614,7 @@ + % + % + */ ++#if defined(HasWINGDI32) + MagickExport void *ImageToHBITMAP(Image* image) + { + unsigned long +@@ -696,5 +699,6 @@ + + return (void *)bitmapH; + } ++#endif + + #endif +diff -ur GraphicsMagick-1.3.36.orig/magick/nt_feature.h GraphicsMagick-1.3.36/magick/nt_feature.h +--- GraphicsMagick-1.3.36.orig/magick/nt_feature.h 2021-01-01 09:35:18.038998185 -0500 ++++ GraphicsMagick-1.3.36/magick/nt_feature.h 2021-01-01 14:23:42.008779169 -0500 +@@ -23,9 +23,11 @@ + extern MagickExport char + *NTRegistryKeyLookup(const char *key); + ++#if defined(HasWINGDI32) + extern MagickExport void + *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *), + *ImageToHBITMAP(Image* image); ++#endif + + #if !defined(XS_VERSION) +
--- a/src/graphicsmagick.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/graphicsmagick.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.35 -$(PKG)_CHECKSUM := b0460d7fb8b2d542a44446322ea62c053bc54b0c +$(PKG)_VERSION := 1.3.36 +$(PKG)_CHECKSUM := df45052bf485407ad4fb7d3b9b305d3e5ebb14e5 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/icu4c.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/icu4c.mk Sun Apr 25 18:31:10 2021 +0200 @@ -1,7 +1,7 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 67.1 -$(PKG)_CHECKSUM := 6822a4a94324d1ba591b3e8ef084e4491af253c1 +$(PKG)_VERSION := 69.1 +$(PKG)_CHECKSUM := 620a71c84428758376baa0fb81a581c3daa866ce $(PKG)_SUBDIR := icu $(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz $(PKG)_URL := https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$($(PKG)_VERSION))/$($(PKG)_FILE)
--- a/src/lapack.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/lapack.mk Sun Apr 25 18:31:10 2021 +0200 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := lapack -$(PKG)_VERSION := 3.9.0 -$(PKG)_CHECKSUM := 0451d180eed2b12b94aaae77e772d7573e87bec4 +$(PKG)_VERSION := 3.9.1 +$(PKG)_CHECKSUM := ccb1e9cb6e7fa7db8a680292457d7d990f25d286 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/Reference-LAPACK/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
--- a/src/lcms-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -diff -ur lcms2-2.9.orig/lcms2.pc.in lcms2-2.9/lcms2.pc.in ---- lcms2-2.9.orig/lcms2.pc.in 2017-12-04 16:39:09.491042791 -0500 -+++ lcms2-2.9/lcms2.pc.in 2017-12-04 16:40:58.941757920 -0500 -@@ -7,5 +7,6 @@ - Description: LCMS Color Management Library - Version: @VERSION@ - Libs: -L${libdir} -llcms2 --Libs.private: @LIB_MATH@ @LIB_THREAD@ -+Libs.private: -ljpeg @LIB_MATH@ @LIB_THREAD@ - Cflags: -I${includedir} -+Requires: libtiff-4
--- a/src/lcms.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/lcms.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := lcms $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11 -$(PKG)_CHECKSUM := 7413047c74de29e20caa5c9afc1b12bf07bbf7a7 +$(PKG)_VERSION := 2.12 +$(PKG)_CHECKSUM := 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 $(PKG)_SUBDIR := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)) $(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE)
--- a/src/libb64.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/libb64.mk Sun Apr 25 18:31:10 2021 +0200 @@ -18,7 +18,7 @@ define $(PKG)_BUILD - CC=$(MXE_CC) CXX=$(MXE_CXX) PKG_CONFIG=$(MXE_PKG_CONFIG) AR=$(MXE_AR) $(MAKE) -C '$(1)/src' + CC=$(MXE_CC) CXX=$(MXE_CXX) PKG_CONFIG=$(MXE_PKG_CONFIG) AR=$(MXE_AR) CFLAGS='-fPIE' $(MAKE) -C '$(1)/src' $(INSTALL) -d '$(3)$(HOST_LIBDIR)' $(INSTALL) -d '$(3)$(HOST_INCDIR)/b64'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libbiosig-1-mingw-install.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,48 @@ +diff --git "a/biosig4c++/Makefile.in" "b/biosig4c++/Makefile.in" +index c05e4d1..8fd7aad 100644 +--- "a/biosig4c++/Makefile.in" ++++ "b/biosig4c++/Makefile.in" +@@ -139,6 +139,7 @@ endif + SONAMEVERSION ?= 3 + + ### TODO: DLEXT does not work correctly on MXE/MINGW ++DLDIR = $(libdir) + ifneq (,$(findstring Darwin, $(shell uname))) + ## Homebrew: + ## brew install gawk +@@ -183,11 +184,17 @@ else ifneq (,$(findstring MINGW, $(shell uname))) + LDLIBS += -liconv -lws2_32 + LDFLAGS += -Wl,-subsystem,windows + LDFLAGS += -L$(prefix)/lib/ ++ DLDIR = $(bindir) + + else + TAR = tar + LD = $(CXX) +- FULLDLEXT = .so.${SONAMEVERSION} ++ ifneq (,$(findstring mingw,$(TARGET))) ++ FULLDLEXT = ${SONAMEVERSION}.dll ++ DLDIR = $(bindir) ++ else ++ FULLDLEXT = .so.${SONAMEVERSION} ++ endif + SONAME_PREFIX = -Wl,-soname= + endif + +@@ -937,12 +944,11 @@ install_libbiosig.a: libbiosig.a libphysicalunits.a libbiosig.pc + install libphysicalunits.a $(DESTDIR)$(libdir) + install libbiosig.pc $(DESTDIR)$(libdir)/pkgconfig/ + +-install_libbiosig.$(DLEXT): libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) +- install -d $(DESTDIR)$(libdir)/pkgconfig/ +- install libbiosig$(FULLDLEXT) $(DESTDIR)$(libdir) +- (cd $(DESTDIR)$(libdir) && ln -sf libbiosig$(FULLDLEXT) libbiosig${SONAMEVERSION}.$(DLEXT)) ++install_libbiosig.$(DLEXT): libbiosig.$(DLEXT) ++ install -d $(DESTDIR)$(DLDIR)/pkgconfig/ ++ install libbiosig.$(DLEXT) $(DESTDIR)$(DLDIR)/libbiosig$(FULLDLEXT) + ifneq (Darwin,$(shell uname)) +- cd $(DESTDIR)$(libdir) && ln -sf libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) ++ cd $(DESTDIR)$(DLDIR) && ln -sf libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) + endif + -ldconfig +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libbiosig.mk Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,65 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libbiosig +$(PKG)_WEBSITE := http://biosig.sf.net/ +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.2.1 +$(PKG)_CHECKSUM := f16bfc7e0f05901e09283020d7cd565bed13c75e +$(PKG)_SUBDIR := biosig-$($(PKG)_VERSION) +$(PKG)_FILE := biosig-$($(PKG)_VERSION).src.tar.gz +$(PKG)_URL := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE) +$(PKG)_DEPS := suitesparse zlib libb64 libiberty libiconv lapack tinyxml dcmtk + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://biosig.sourceforge.io/download.html' | \ + $(SED) -n 's_.*>v\([0-9]\.[0-9]\.[0-9]\)<.*_\1_p' | \ + head -1 +endef + +ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_MAKE_FLAGS := TARGET=$(TARGET) CROSS=$(TARGET) + $(PKG)_AUTOCONF_CROSS_FLAGS := \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes +else + $(PKG)_MAKE_FLAGS := \ + LDLIBS='-liconv -lm -ltinyxml' \ + LDFLAGS=$(MXE_LDFLAGS) \ + CFLAGS=$(MXE_CFLAGS) +endif + + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $($(PKG)_AUTOCONF_CROSS_FLAGS) \ + --prefix=$(HOST_PREFIX) \ + CC='$(MXE_CC)' \ + CXX='$(MXE_CXX)' \ + RANLIB='$(MXE_RANLIB)' \ + AR='$(MXE_AR)' \ + ARFLAGS=rcs \ + LDFLAGS=$(MXE_LDFLAGS) \ + CFLAGS=$(MXE_CFLAGS) \ + LIBTOOL=$(LIBTOOL) \ + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ + PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' + + # make sure NDEBUG is defined + $(SED) -i '/NDEBUG/ s|#||g' '$(1)'/biosig4c++/Makefile + + $($(PKG)_MAKE_FLAGS) $(MAKE) -C '$(1)' lib tools + $($(PKG)_MAKE_FLAGS) $(MAKE) -C '$(1)/biosig4c++' install DESTDIR='$(3)' + + # FIXME: These files aren't installed by the Makefile rule. + # Do we really need them? + if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ + $(INSTALL) '$(1)/biosig4c++/libbiosig.dll.a' '$(3)$(HOST_LIBDIR)'; \ + $(INSTALL) '$(1)/biosig4c++/libgdf.dll' '$(3)$(HOST_BINDIR)'; \ + $(INSTALL) '$(1)/biosig4c++/libgdf.dll.a' '$(3)$(HOST_LIBDIR)'; \ + $(INSTALL) '$(1)/biosig4c++/libphysicalunits.dll' '$(3)$(HOST_BINDIR)'; \ + $(INSTALL) '$(1)/biosig4c++/libphysicalunits.dll.a' '$(3)$(HOST_LIBDIR)'; \ + fi +endef +
--- a/src/libgcrypt.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/libgcrypt.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.6 -$(PKG)_CHECKSUM := 406b02873833427898d16bcc8483bc5c91c73d4a +$(PKG)_VERSION := 1.9.2 +$(PKG)_CHECKSUM := 29bd5d0a8f674d4521167dd518ef99b26d1e8f27 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE)
--- a/src/libgpg_error.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/libgpg_error.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.39 -$(PKG)_CHECKSUM := 991a7a53e778a3de5ba8aad711e0bc9453101f4b +$(PKG)_VERSION := 1.42 +$(PKG)_CHECKSUM := 5e620d71fc24d287a7ac2460b1d819074bb8b9bb $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
--- a/src/libharu.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/libharu.mk Sun Apr 25 18:31:10 2021 +0200 @@ -12,7 +12,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/libharu/libharu/tags' | \ - $(SED) -n 's,.*/archive/RELEASE_\([0-9][^"]*\)\.tar.*,\1,p' | \ + $(SED) -n 's,.*/tags/RELEASE_\([0-9][^"]*\)\.tar.*,\1,p' | \ $(SED) 's,_,.,g' | \ grep -v 'RC' | \ head -1
--- a/src/libproxy.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/libproxy.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,11 +3,11 @@ PKG := libproxy $(PKG)_IGNORE := -$(PKG)_VERSION := 0.4.15 -$(PKG)_CHECKSUM := 5261bf6875feef15a706b34e7c010619f484e92f +$(PKG)_VERSION := 0.4.17 +$(PKG)_CHECKSUM := cded2be341aa15bb1dc4ba574c0687e2ba8d59b2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz -$(PKG)_URL := https://github.com/libproxy/libproxy/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/libproxy/libproxy/archive/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := $(PKG)_CMAKE_FLAGS :=
--- a/src/libsndfile.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/libsndfile.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,38 +3,37 @@ PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.28 -$(PKG)_CHECKSUM := 85aa967e19f6b9bf975601d79669025e5f8bc77d +$(PKG)_VERSION := 1.0.31 +$(PKG)_CHECKSUM := 4ada136ae38b08a7f17160f44ca9f0d85d53da50 $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.mega-nerd.com/libsndfile/files/$($(PKG)_FILE) -$(PKG)_DEPS := sqlite flac ogg vorbis +$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := sqlite flac ogg opus vorbis define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.mega-nerd.com/libsndfile/' | \ - grep '<META NAME="Version"' | \ - $(SED) -n 's,.*CONTENT="libsndfile-\([0-9][^"]*\)">.*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://github.com/libsndfile/libsndfile/tags' | \ + $(SED) -n 's|.*releases/tag/[v]*\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 endef -$(PKG)_EXTRA_CONFIGURE_OPTIONS := -ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-stack-smash-protection -endif +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_TESTING=no \ + -DBUILD_PROGRAMS=no \ + -DBUILD_EXAMPLES=no \ + -DINSTALL_MANPAGES=no \ + -DENABLE_EXTERNAL_LIBS=yes \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . -define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi -IM4 - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --enable-sqlite \ - --enable-external-libs \ - --disable-octave \ - --disable-alsa \ - --disable-full-suite \ - $($(PKG)_EXTRA_CONFIGURE_OPTIONS) - $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) - $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install + + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf '$(3)$(HOST_PREFIX)/share/doc/$(PKG)'; \ + fi + endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libsodium.mk Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libsodium +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.0.18 +$(PKG)_CHECKSUM := cd8a76b79aeb077e8d3eea478ea6241972593dfd +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/jedisct1/$(PKG)/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/jedisct1/libsodium/tags' | \ + $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +$(PKG)_EXTRA_CONFIGURE_OPTIONS := +ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) + $(PKG)_EXTRA_CONFIGURE_OPTIONS += CFLAGS="-O2 -g -fstack-protector" +endif + +define $(PKG)_BUILD + cd '$(1)' && ./autogen.sh \ + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) +endef
--- a/src/llvm.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/llvm.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,12 +3,12 @@ PKG := llvm $(PKG)_IGNORE := -$(PKG)_VERSION := 7.1.0 -$(PKG)_CHECKSUM := d43bfea58a35e058b93a6af36a728cfc64add33d +$(PKG)_VERSION := 11.0.1 +$(PKG)_CHECKSUM := 1a911295260d4e41116b72788eb602702b4bb252 $(PKG)_SUBDIR := llvm-$($(PKG)_VERSION).src $(PKG)_FILE := llvm-$($(PKG)_VERSION).src.tar.xz $(PKG)_URL := https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := build-python +$(PKG)_DEPS := build-cmake build-ninja build-python3 define $(PKG)_UPDATE wget -q -O- 'http://releases.llvm.org/download.html?' | \ @@ -17,12 +17,17 @@ head -1 endef +$(PKG)_CMAKE_PYTHON_FLAGS := \ + -DPYTHON_EXECUTABLE:FILEPATH='$(ROOT_PREFIX)/bin/python3' + ifeq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_SYSTEM),gnu-linux) define $(PKG)_BUILD mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \ + -GNinja \ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ + $($(PKG)_CMAKE_PYTHON_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLLVM_BUILD_LLVM_DYLIB=ON \ -DLLVM_LINK_LLVM_DYLIB=ON \ @@ -40,7 +45,7 @@ -DLLVM_ENABLE_DOXYGEN=OFF \ -DLLVM_ENABLE_BACKTRACES=OFF - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) install endef else define $(PKG)_BUILD @@ -64,8 +69,10 @@ define $(PKG)_BUILD mkdir '$(1)/.build' cd '$(1)/.build' && 'cmake' .. \ + -GNinja \ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ + $($(PKG)_CMAKE_PYTHON_FLAGS) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLLVM_BUILD_TOOLS=OFF \ -DLLVM_BUILD_LLVM_DYLIB=ON \ @@ -93,14 +100,11 @@ -DLLVM_INCLUDE_RUNTIMES=OFF \ $($(PKG)_CCACHE_OPTIONS) - $(MAKE) -C '$(1)/.build' -j $(JOBS) LLVMSupport - $(MAKE) -C '$(1)/.build' -j $(JOBS) CONFIGURE_LLVM_NATIVE - $(MAKE) -C '$(1)/.build/NATIVE' -j $(JOBS) LLVMSupport - $(MAKE) -C '$(1)/.build' -j $(JOBS) llvm-config - $(MAKE) -C '$(1)/.build' -j $(JOBS) install DESTDIR='$(3)' + cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) llvm-config + cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) install # create symlink for shared library so that llvm-config can find it - cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION))).dll + cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).dll # install native llvm-config in HOST_BINDIR because it won't find the libs otherwise $(INSTALL) -d '$(HOST_BINDIR)'
--- a/src/lua.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/lua.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.5 -$(PKG)_CHECKSUM := 112eb10ff04d1b4c9898e121d6bdf54a81482447 +$(PKG)_VERSION := 5.4.3 +$(PKG)_CHECKSUM := 1dda2ef23a9828492b4595c0197766de6e784bc7 $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE)
--- a/src/mesa.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/mesa.mk Sun Apr 25 18:31:10 2021 +0200 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 20.1.10 -$(PKG)_CHECKSUM := 151d5edff5caeead98f428698cf02ddb0cf66d4b +$(PKG)_VERSION := 20.3.5 +$(PKG)_CHECKSUM := 444b0b147537ea00c02e779d610009a377649db6 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) @@ -26,6 +26,7 @@ else ifeq ($(USE_SYSTEM_X11_LIBS),no) $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes + $(PKG)_BUILD_X11_LIBS_FLAGS = -Dxlib-lease=disabled else $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH) endif @@ -36,7 +37,8 @@ $(PKG)_X11_FLAGS := -Dplatforms='x11' \ -Dglx=gallium-xlib \ - -Ddri-drivers='' + -Ddri-drivers='' \ + $($(PKG)_BUILD_X11_LIBS_FLAGS) endif define $(PKG)_BUILD @@ -47,11 +49,17 @@ $($(PKG)_X11_FLAGS) \ -Dgallium-drivers=swrast \ -Dvulkan-drivers='' \ - -Degl=false \ - -Dgbm=false \ - -Dshared-llvm=true + -Degl=disabled \ + -Dgbm=disabled \ + -Dshared-llvm=enabled cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) install + + # install headers + for i in EGL GLES GLES2 GLES3 KHR; do \ + $(INSTALL) -d "$(HOST_INCDIR)/$$i"; \ + $(INSTALL) -m 644 "$(1)/include/$$i/"* "$(HOST_INCDIR)/$$i/"; \ + done # opengl32.dll.a shadows libopengl32.a from mingw. They export slightly # different symbols which causes problems for some packages. So don't install
--- a/src/mingw-libgcrypt-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/mingw-libgcrypt-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -58,33 +58,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Saikrishna Arcot <saiarcot895@gmail.com> -Date: Fri, 12 Jun 2015 14:53:55 -0700 -Subject: [PATCH 2/3] Don't call git to determine the revision. - - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [1]) - # processing is done by autoconf and not during the configure run. - m4_define(mym4_version, - [mym4_version_major.mym4_version_minor.mym4_version_micro]) --m4_define([mym4_revision], -- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -+m4_define([mym4_revision], [4091]) - m4_define([mym4_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) --m4_define([mym4_betastring], -- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ -- awk -F- '$3!=0{print"-beta"$3}'])) -+m4_define([mym4_betastring], []) - m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) - m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones@redhat.com> Date: Sun, 28 Jun 2015 17:17:25 +0200 Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
--- a/src/mingw-openblas-1-xerbla.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/mingw-openblas-1-xerbla.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,6 +1,6 @@ -diff -ur OpenBLAS-0.3.8.orig/driver/others/Makefile OpenBLAS-0.3.8/driver/others/Makefile ---- OpenBLAS-0.3.8.orig/driver/others/Makefile 2020-02-14 10:39:58.164130459 -0500 -+++ OpenBLAS-0.3.8/driver/others/Makefile 2020-02-14 10:46:23.254020333 -0500 +diff -ur OpenBLAS-0.3.13.orig/driver/others/Makefile OpenBLAS-0.3.13/driver/others/Makefile +--- OpenBLAS-0.3.13.orig/driver/others/Makefile 2020-12-27 09:18:47.133825725 -0500 ++++ OpenBLAS-0.3.13/driver/others/Makefile 2020-12-27 09:22:06.676660536 -0500 @@ -1,7 +1,7 @@ TOPDIR = ../.. include ../../Makefile.system @@ -10,7 +10,7 @@ #COMMONOBJS += slamch.$(SUFFIX) slamc3.$(SUFFIX) dlamch.$(SUFFIX) dlamc3.$(SUFFIX) -@@ -84,25 +84,22 @@ +@@ -88,29 +88,26 @@ ifeq ($(DYNAMIC_ARCH), 1) ifeq ($(ARCH),arm64) @@ -25,11 +25,16 @@ -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic_zarch.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) dynamic_zarch.$(SUFFIX) else + ifeq ($(ARCH),mips64) +-HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic_mips64.$(SUFFIX) ++HPLOBJS = memory.$(SUFFIX) dynamic_mips64.$(SUFFIX) + else -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) dynamic.$(SUFFIX) endif endif endif + endif else -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) parameter.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) parameter.$(SUFFIX) @@ -41,7 +46,7 @@ dynamic.$(SUFFIX) : dynamic.c $(CC) $(CFLAGS) -c $< -o $(@F) -@@ -190,9 +187,6 @@ +@@ -198,9 +195,6 @@ mulx.$(SUFFIX) : $(ARCH)/mulx.c $(CC) $(CFLAGS) -c -DXDOUBLE -UCOMPLEX $< -o $(@F)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-texinfo-2-makeinfo-non-ASCII-perl.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,16 @@ +"perl" cannot run scripts in paths with non-ASCII characters on Windows. +To work around that, change to the directory containing the script first, +then call it without path. +FIXME: Could changing the directory have negative side effects for the +"makeinfo" script? + +diff --git "a/util/makeinfo.bat" "b/util/makeinfo.bat" +index 5ae4286..6a51502 100644 +--- "a/util/makeinfo.bat" ++++ "b/util/makeinfo.bat" +@@ -1,2 +1,4 @@ + @echo off +-perl "%~dpn0" %* ++%~d0 ++cd "%~dp0" ++perl "%~n0" %*
--- a/src/mingw-w64.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/mingw-w64.mk Sun Apr 25 18:31:10 2021 +0200 @@ -11,20 +11,26 @@ $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/' | \ - $(SED) -n 's,.*mingw-w64-v\([0-9.]*\)\.tar.*,\1,p' | \ - $(SORT) -V | \ - tail -1 + $(WGET) -q -O- 'http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/' | \ + $(SED) -n 's,.*mingw-w64-v\([0-9.]*\)\.tar.*,\1,p' | \ + $(SORT) -V | \ + tail -1 endef +ifeq ($(OCTAVE_TARGET),default-octave) + # FIXME: Adapt condition when Octave 7 moves to stable or it is released. + $(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601 +endif + define $(PKG)_BUILD - mkdir '$(1).headers-build' - cd '$(1).headers-build' && '$(1)/mingw-w64-headers/configure' \ - --host='$(TARGET)' \ - --prefix='$(HOST_PREFIX)' \ - --enable-sdk=all \ - --enable-idl \ - --enable-secure-api + mkdir '$(1).headers-build' + cd '$(1).headers-build' && '$(1)/mingw-w64-headers/configure' \ + --host='$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --enable-sdk=all \ + --enable-idl \ + --enable-secure-api \ + $($(PKG)_WINAPI_VERSION_FLAGS) - $(MAKE) -C '$(1).headers-build' install + $(MAKE) -C '$(1).headers-build' install endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-zeromq-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,64 @@ +--- a/tests/testutil.cpp ++++ b/tests/testutil.cpp +@@ -382,7 +382,7 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_) + protocol_ == IPPROTO_UDP + ? IPPROTO_UDP + : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); +- TEST_ASSERT_NOT_EQUAL (-1, s_pre); ++ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); + + if (af_ == AF_INET || af_ == AF_INET6) { + const char *port = strrchr (endpoint_, ':') + 1; +@@ -439,7 +439,7 @@ fd_t bind_socket_resolve_port (const char *address_, + protocol_ == IPPROTO_UDP + ? IPPROTO_UDP + : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); +- TEST_ASSERT_NOT_EQUAL (-1, s_pre); ++ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); + + if (af_ == AF_INET || af_ == AF_INET6) { + #ifdef ZMQ_HAVE_WINDOWS + +--- a/tests/testutil.hpp ++++ b/tests/testutil.hpp +@@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = { + #include <winsock2.h> + #include <ws2tcpip.h> + #include <stdexcept> +-#define close closesocket + typedef int socket_size_t; + inline const char *as_setsockopt_opt_t (const void *opt) + { + +--- a/tests/testutil.cpp ++++ b/tests/testutil.cpp +@@ -296,7 +296,7 @@ int is_ipv6_available () + ipv6 = 0; + } + #endif +- close (fd); ++ closesocket (fd); + } + + return ipv6; +@@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_, + #else + int fd = mkstemp (buffer); + TEST_ASSERT_TRUE (fd != -1); +- close (fd); ++ closesocket (fd); + #endif + #endif + strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer); +diff -ur zeromq-4.3.3.orig/Makefile.in zeromq-4.3.3/Makefile.in +--- zeromq-4.3.3.orig/Makefile.in 2021-01-16 16:58:57.118548621 -0500 ++++ zeromq-4.3.3/Makefile.in 2021-01-16 17:07:39.885588121 -0500 +@@ -2881,7 +2881,7 @@ + $(am__append_29) $(am__append_30) $(am__append_31) \ + $(am__append_32) $(am__append_33) $(am__append_36) \ + $(am__append_37) $(am__append_38) $(am__append_39) +-UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT ++UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -D__USE_MINGW_ANSI_STDIO=1 + UNITY_LIBS = $(top_builddir)/external/unity/libunity.a + external_unity_libunity_a_SOURCES = external/unity/unity.c \ + external/unity/unity.h \
--- a/src/native-gcc.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/native-gcc.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 9.3.0 -$(PKG)_CHECKSUM := b746688bf045a316fc92c3528138ad10d0822b6b +$(PKG)_VERSION := 10.2.0 +$(PKG)_CHECKSUM := 8de0aecd3a52bb92b43082df8a9256356d1f03be $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/netcdf-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/netcdf-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,14 +1,36 @@ -diff --git "a/netcdf/ncdump/ncvalidator.c" "b/netcdf/ncdump/ncvalidator.c" -index a0e4acb..2a7c5af 100644 ---- "a/ncdump/ncvalidator.c" -+++ "b/ncdump/ncvalidator.c" -@@ -76,7 +76,9 @@ THIS SOFTWARE. +diff -ur netcdf-c-4.7.4.orig/include/XGetopt.h netcdf-c-4.7.4/include/XGetopt.h +--- netcdf-c-4.7.4.orig/include/XGetopt.h 2020-12-02 07:32:11.168214023 -0500 ++++ netcdf-c-4.7.4/include/XGetopt.h 2020-12-02 07:33:54.920018162 -0500 +@@ -20,6 +20,7 @@ + #include <stdio.h> + #include <tchar.h> + ++#if !defined(HAVE_GETOPT_H) + #if defined(DLL_NETCDF) + # if defined(DLL_EXPORT) + # define GTOPT_EXTRA __declspec(dllexport) +@@ -36,5 +37,6 @@ + extern TCHAR *optarg; + + int getopt(int argc, TCHAR *argv[], TCHAR *optstring); ++#endif + + #endif //XGETOPT_H +diff -ur netcdf-c-4.7.4.orig/ncdump/ncvalidator.c netcdf-c-4.7.4/ncdump/ncvalidator.c +--- netcdf-c-4.7.4.orig/ncdump/ncvalidator.c 2020-12-02 07:32:11.204216037 -0500 ++++ netcdf-c-4.7.4/ncdump/ncvalidator.c 2020-12-02 07:41:06.753176006 -0500 +@@ -76,10 +76,14 @@ #ifdef _WIN32 #include <io.h> #define snprintf _snprintf +#ifndef HAVE_UNISTD_H #include "XGetopt.h" +#endif ++#if !defined(HAVE_GETOPT_H) int opterr; int optind; #endif ++#endif + + #define X_ALIGN 4 + #define X_INT_MAX 2147483647
--- a/src/nettle.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/nettle.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.6 -$(PKG)_CHECKSUM := 22e48a4d232ccd26ba8303709f2222b422a8827d +$(PKG)_VERSION := 3.7.2 +$(PKG)_CHECKSUM := d617fbcf8d301dfd887129c3883629d4d097c579 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
--- a/src/npp.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/npp.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,10 +3,10 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 7.8.9 -$(PKG)_CHECKSUM := 26297d8c55833a6c43d16f3b0fa842ecd5153e20 +$(PKG)_VERSION := 7.9.5 +$(PKG)_CHECKSUM := 2c1fd73f5bc2f5d22c7424f3ea5dc5af03bbb7dd $(PKG)_SUBDIR := -$(PKG)_FILE := $(PKG).$($(PKG)_VERSION).bin.zip +$(PKG)_FILE := $(PKG).$($(PKG)_VERSION).portable.zip $(PKG)_URL := https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/openblas.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/openblas.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.12 -$(PKG)_CHECKSUM := ae647fed597ae891a7f122b9ddc6b15d4b7e0656 +$(PKG)_VERSION := 0.3.13 +$(PKG)_CHECKSUM := 685537a821819ef4dae5901998a57f0eec5bddad $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openjpeg.mk Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,33 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := openjpeg +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.4.0 +$(PKG)_CHECKSUM := bbbf4dc4d9ce95286843cd39ac2febd3fd516c9d +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/uclouvain/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := lcms libpng tiff zlib + +$(PKG)_CMAKE_FLAGS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/uclouvain/openjpeg/tags' | \ + $(SED) -n 's|.*releases/tag/v\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_PKGCONFIG_FILES=ON \ + -DBUILD_TESTING=OFF \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opkg-biosig.mk Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := opkg-biosig +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.2.1 +$(PKG)_CHECKSUM := bfcc2095b59bebfd3d7a8de40fb6855256e4af1c +$(PKG)_SUBDIR := biosig4octave-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).src.tar.gz +$(PKG)_URL := https://pub.ist.ac.at/~schloegl/biosig/prereleases/$($(PKG)_FILE) +$(PKG)_DEPS := libbiosig + +ifeq ($(ENABLE_BINARY_PACKAGES),yes) + $(PKG)_DEPS += $(OCTAVE_TARGET) +endif + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opus.mk Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,40 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := opus +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3.1 +$(PKG)_CHECKSUM := ed226536537861c9f0f1ef7ca79dffc225bc181b +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://archive.mozilla.org/pub/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://archive.mozilla.org/pub/opus/?C=M;O=D' | \ + $(SED) -n 's,.*opus-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v 'alpha' | \ + grep -v 'beta' | \ + grep -v 'rc' | \ + $(SORT) -Vr | \ + head -1 +endef + +$(PKG)_EXTRA_CONFIGURE_OPTIONS := +ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) + $(PKG)_EXTRA_CONFIGURE_OPTIONS += CFLAGS="-O2 -g -fstack-protector" +endif + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' + #rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus_*.3 + #rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus.h.3 + #rm -rf '$(PREFIX)/$(TARGET)'/share/doc/opus/html +endef
--- a/src/pcre2.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/pcre2.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.35 -$(PKG)_CHECKSUM := 2e5ee2dd397fa8c3ce9aed1a986e51d66a88bdb0 +$(PKG)_VERSION := 10.36 +$(PKG)_CHECKSUM := 65958cfc799c1474a272938f5690dff5f10db216 $(PKG)_SUBDIR := pcre2-$($(PKG)_VERSION) $(PKG)_FILE := pcre2-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/portaudio.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/portaudio.mk Sun Apr 25 18:31:10 2021 +0200 @@ -19,7 +19,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.portaudio.com/download.html' | \ + $(WGET) -q -O- 'http://files.portaudio.com/download.html' | \ $(SED) -n 's,.*pa_stable_v\([0-9][^>]*\)\.tgz.*,\1,p' | \ head -1 endef
--- a/src/proj.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/proj.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 7.1.1 -$(PKG)_CHECKSUM := 3e713e3f7bbd0e0211dda500bfc5b05364c45485 +$(PKG)_VERSION := 7.2.1 +$(PKG)_CHECKSUM := 593005f2e4e76575ebee5cf228c968be730f9fd3 $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE)
--- a/src/qhull.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qhull.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := qhull $(PKG)_IGNORE := -$(PKG)_VERSION := 2020.1 -$(PKG)_CHECKSUM := a938aa73a8964f81786a05fc4c98044878e09f07 +$(PKG)_VERSION := 2020.2 +$(PKG)_CHECKSUM := 739346b5d6b3fe3675243b156c7ffe55f60cc3c9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := qhull-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/qhull/$(PKG)/archive/$($(PKG)_VERSION).tar.gz @@ -23,6 +23,9 @@ tail -1 endef +# FIXME: Building and installing the deprecated target "libqhull" can be +# removed when Octave switches to using "libqhull_r" (see bug #60016). + define $(PKG)_BUILD mkdir '$(1)/../.build' cd '$(1)/../.build' && cmake \ @@ -33,5 +36,12 @@ -DDOC_INSTALL_DIR='$(1)' \ ../$($(PKG)_SUBDIR) make -C $(1)/../.build -j $(JOBS) + make -C $(1)/../.build libqhull -j $(JOBS) make -C $(1)/../.build -j 1 install DESTDIR=$(3) + if [ x$(MXE_WINDOWS_BUILD) == xyes ]; then \ + $(INSTALL) '$(1)/../.build/libqhull.dll.a' '$(3)$(HOST_LIBDIR)/'; \ + $(INSTALL) '$(1)/../.build/libqhull.dll' '$(3)$(HOST_BINDIR)/'; \ + else \ + $(INSTALL) $(1)/../.build/libqhull.so* '$(3)$(HOST_LIBDIR)/'; \ + fi endef
--- a/src/qscintilla.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qscintilla.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := qscintilla $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.5 -$(PKG)_CHECKSUM := 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0 +$(PKG)_VERSION := 2.11.6 +$(PKG)_CHECKSUM := fe010886e59996b53e38811f67993262220c8ae5 $(PKG)_SUBDIR := QScintilla-$($(PKG)_VERSION) $(PKG)_FILE := QScintilla-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/qtbase-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qtbase-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,6 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 7c5ba14d5b42334edb6a70239cf231f847f508ef Mon Sep 17 00:00:00 2001 +From 2c59523387b10937ff7d085bc34ec3df68805fea Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/2] cmake: Rearrange STATIC vs INTERFACE targets @@ -12,10 +12,10 @@ See also: https://github.com/mxe/mxe/issues/1185 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 364c23e750..c90dd302cf 100644 +index 309798a767..18156cac9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -343,6 +343,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -370,6 +370,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") !!ENDIF @@ -25,10 +25,10 @@ !!IF !isEmpty(CMAKE_STATIC_TYPE) if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) !!IF !isEmpty(CMAKE_DEBUG_TYPE) -@@ -380,9 +383,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - +@@ -411,9 +414,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ENDIF -!!ELSE -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) @@ -36,20 +36,33 @@ add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF -- -2.20.1 +2.25.1 + + +From c3fa97702a080eb1a931fd1f41f7a1dd5b775523 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 11 Jun 2017 00:27:41 +0200 +Subject: [PATCH 2/2] use pkg-config for harfbuzz + +Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 -diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf ---- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 -+++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400 -@@ -46,7 +46,7 @@ - QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC - QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC - QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC --QMAKE_CFLAGS_ISYSTEM = -isystem -+QMAKE_CFLAGS_ISYSTEM = -I - QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden - QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 5ebcdb99b5..2553cb5cf6 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -303,7 +303,8 @@ + }, + "headers": "harfbuzz/hb.h", + "sources": [ +- "-lharfbuzz" ++ { "type": "pkgConfig", "args": "harfbuzz" }, ++ "-lharfbuzz" + ] + }, + "imf": { +-- +2.25.1 + diff -ur qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400 @@ -65,3 +78,4 @@ #else m_fontDatabase = QPlatformIntegration::fontDatabase(); #endif +
--- a/src/qtbase.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qtbase.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.14.2 -$(PKG)_CHECKSUM := 9de814d3b9005bf984a78e4b564fbb9413e043c4 +$(PKG)_VERSION := 5.15.2 +$(PKG)_CHECKSUM := b5ad67fc6381ad7fae0296944734198488d096a3 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) @@ -56,8 +56,9 @@ ## there are a number of other places that will need to be adjusted. ## --jwe $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5' - $(PKG)_CONFIGURE_OPTS += -no-xcb + $(PKG)_CONFIGURE_OPTS += -no-xcb -opengl dynamic else + $(PKG)_CONFIGURE_OPTS += -opengl desktop $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)' $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2' ifeq ($(USE_SYSTEM_OPENGL),no) @@ -124,7 +125,6 @@ -shared \ $($(PKG)_CONFIGURE_PREFIX_OPTION) \ -hostprefix '$(BUILD_TOOLS_PREFIX)' \ - -opengl desktop \ -no-glib \ -accessibility \ -nomake examples \
--- a/src/qtimageformats.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qtimageformats.mk Sun Apr 25 18:31:10 2021 +0200 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 012e05d4fc3ab480aa769ec71f66f241b6d1436a +$(PKG)_CHECKSUM := c17b57cec197d721b3c844ff1dd68ab9996f4603 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qtsvg.mk Sun Apr 25 18:31:10 2021 +0200 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b298847fa6619aa50f8d74f6c146e75fd7c88a48 +$(PKG)_CHECKSUM := 08531b47924078cbde6dfbf56da83651d58f6a13 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qttools.mk Sun Apr 25 18:31:10 2021 +0200 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 172794608668d772c9ad6cd289bb84e0b3336999 +$(PKG)_CHECKSUM := ae92f651b1b029bd6f55fc8888134d73d8ad19be $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/qttranslations.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := cf5e6ebf5a2ef2786908c03cbe191b31efa927e0 +$(PKG)_CHECKSUM := 980350bcbf680697bb2903955e2568ee9b5b365f $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
--- a/src/readline-0-001.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-001 - -Bug-Reported-by: chet.ramey@case.edu -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -The history file reading code doesn't close the file descriptor open to -the history file when it encounters a zero-length file. - -diff --git "a/histfile.c" "b/histfile.c" ---- a/histfile.c 2018-06-11 09:14:52.000000000 -0400 -+++ b/histfile.c 2019-05-16 15:55:57.000000000 -0400 -@@ -306,4 +306,5 @@ - { - free (input); -+ close (file); - return 0; /* don't waste time if we don't have to */ - } -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --0 -+1
--- a/src/readline-0-002.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-002 - -Bug-Reported-by: lessbug@qq.com -Bug-Reference-ID: <tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com> -Bug-Reference-URL: - -Bug-Description: - -When using previous-history to go back beyond the beginning of the history list, -it's possible to move to an incorrect partial line. - -diff --git "a/misc.c" "b/misc.c" ---- a/misc.c 2017-07-07 17:30:12.000000000 -0400 -+++ b/misc.c 2019-05-16 11:43:46.000000000 -0400 -@@ -577,4 +577,5 @@ - { - HIST_ENTRY *old_temp, *temp; -+ int had_saved_line; - - if (count < 0) -@@ -589,4 +590,5 @@ - - /* If we don't have a line saved, then save this one. */ -+ had_saved_line = _rl_saved_line_for_history != 0; - rl_maybe_save_line (); - -@@ -612,5 +614,6 @@ - if (temp == 0) - { -- rl_maybe_unsave_line (); -+ if (had_saved_line == 0) -+ _rl_free_saved_history_line (); - rl_ding (); - } -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --1 -+2
--- a/src/readline-0-003.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-003 - -Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com> -Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html - -Bug-Description: - -Reading history entries with timestamps can result in history entries joined -by linefeeds. - -diff --git "a/histfile.c" "b/histfile.c" ---- a/histfile.c 2018-06-11 09:14:52.000000000 -0400 -+++ b/histfile.c 2019-05-16 15:55:57.000000000 -0400 -@@ -370,7 +370,9 @@ - - has_timestamps = HIST_TIMESTAMP_START (buffer); -- history_multiline_entries += has_timestamps && history_write_timestamps; -+ history_multiline_entries += has_timestamps && history_write_timestamps; - - /* Skip lines until we are at FROM. */ -+ if (has_timestamps) -+ last_ts = buffer; - for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) - if (*line_end == '\n') -@@ -381,5 +383,16 @@ - if (HIST_TIMESTAMP_START(p) == 0) - current_line++; -+ else -+ last_ts = p; - line_start = p; -+ /* If we are at the last line (current_line == from) but we have -+ timestamps (has_timestamps), then line_start points to the -+ text of the last command, and we need to skip to its end. */ -+ if (current_line >= from && has_timestamps) -+ { -+ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) -+ ; -+ line_start = (*line_end == '\n') ? line_end + 1 : line_end; -+ } - } - -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --2 -+3
--- a/src/readline-0-004.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 8.0 -Patch-ID: readline80-004 - -Bug-Reported-by: auroralanes@protonmail.ch -Bug-Reference-ID: <WikEDKluAyoha9IDLp83rbN7_Uinr2rrpvSV_z4wmt9qur9piN-FNOn17P0cAizEVah1Fvc9d641vIIWX_7SC6EUTz0CatnOH-C-UK3rPYc=@protonmail.ch> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2020-01/msg00008.html - -Bug-Description: - -If writing the history file fails, and renaming the backup history file fails, -it's possible for readline's history code to return the wrong error to its -caller. - -diff --git "a/histfile.c" "b/histfile.c" ---- a/histfile.c 2019-11-19 10:31:58.000000000 -0500 -+++ b/histfile.c 2020-02-01 16:28:29.000000000 -0500 -@@ -621,4 +621,5 @@ - if (rv != 0) - { -+ rv = errno; - if (tempname) - unlink (tempname); -@@ -768,4 +769,5 @@ - if (rv != 0) - { -+ rv = errno; - if (tempname) - unlink (tempname); -diff --git "a/patchlevel" "b/patchlevel" ---- a/patchlevel 2013-11-15 08:11:11.000000000 -0500 -+++ b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --3 -+4
--- a/src/readline-1-display.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/readline-1-display.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,6 +1,6 @@ -diff -ur readline-8.0.orig/display.c readline-8.0.disp/display.c ---- readline-8.0.orig/display.c 2019-03-20 07:41:37.573786782 -0400 -+++ readline-8.0.disp/display.c 2019-03-20 17:00:29.866659451 -0400 +diff -ur readline-8.1.orig/display.c readline-8.1/display.c +--- readline-8.1.orig/display.c 2020-12-19 07:41:44.122860975 -0500 ++++ readline-8.1/display.c 2020-12-19 07:52:09.009050414 -0500 @@ -59,6 +59,11 @@ #include "rlprivate.h" #include "xmalloc.h" @@ -13,7 +13,7 @@ #if !defined (strchr) && !defined (__STDC__) extern char *strchr (), *strrchr (); #endif /* !strchr && !__STDC__ */ -@@ -2367,6 +2372,20 @@ +@@ -2686,6 +2691,20 @@ int in_invisline; int mb_cur_max = MB_CUR_MAX; @@ -34,7 +34,7 @@ woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); cpos = _rl_last_c_pos; -@@ -2519,6 +2538,20 @@ +@@ -2832,6 +2851,20 @@ { register int delta, i; @@ -55,7 +55,7 @@ if (_rl_last_v_pos == to || to > _rl_screenheight) return; -@@ -2848,6 +2881,17 @@ +@@ -3157,6 +3190,17 @@ void _rl_clear_to_eol (int count) { @@ -73,9 +73,9 @@ #ifndef __MSDOS__ if (_rl_term_clreol) tputs (_rl_term_clreol, 1, _rl_output_character_function); -@@ -2873,6 +2917,33 @@ +@@ -3182,6 +3226,33 @@ void - _rl_clear_screen (void) + _rl_clear_screen (int clrscr) { +#if defined (_WIN32) + COORD coordScreen = { 0, 0 };
--- a/src/readline-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/readline-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,16 +1,7 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Timothy Gu <timothygu99@gmail.com> -Date: Tue, 30 Sep 2014 17:16:32 -0700 -Subject: [PATCH 1/1] Handle missing S_IS* macros more gracefully - - -diff --git a/colors.c b/colors.c -index 1111111..2222222 100644 ---- a/colors.c -+++ b/colors.c -@@ -200,8 +200,10 @@ _rl_print_color_indicator (const char *f) +diff -ur readline-8.1/colors.c readline-8.1.1/colors.c +--- readline-8.1/colors.c 2019-11-19 10:30:54.000000000 -0500 ++++ readline-8.1.1/colors.c 2020-12-19 07:54:28.888704198 -0500 +@@ -207,8 +207,10 @@ #endif if (is_colored (C_CAP) && 0) //f->has_capability) colored_filetype = C_CAP; @@ -21,7 +12,7 @@ else if ((1 < astat.st_nlink) && is_colored (C_MULTIHARDLINK)) colored_filetype = C_MULTIHARDLINK; } -@@ -215,8 +217,10 @@ _rl_print_color_indicator (const char *f) +@@ -222,8 +224,10 @@ colored_filetype = C_STICKY_OTHER_WRITABLE; else #endif @@ -32,11 +23,11 @@ #if defined (S_ISVTX) else if ((mode & S_ISVTX) != 0 && is_colored (C_STICKY)) colored_filetype = C_STICKY; -diff --git a/colors.h b/colors.h -index 1111111..2222222 100644 ---- a/colors.h -+++ b/colors.h -@@ -96,7 +96,7 @@ enum indicator_no +Only in readline-8.1.1: colors.c.orig +diff -ur readline-8.1/colors.h readline-8.1.1/colors.h +--- readline-8.1/colors.h 2016-01-25 10:38:11.000000000 -0500 ++++ readline-8.1.1/colors.h 2020-12-19 07:54:28.888704198 -0500 +@@ -96,7 +96,7 @@ }; @@ -45,10 +36,9 @@ # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) #endif -diff --git a/posixstat.h b/posixstat.h -index 1111111..2222222 100644 ---- a/posixstat.h -+++ b/posixstat.h +diff -ur readline-8.1/posixstat.h readline-8.1.1/posixstat.h +--- readline-8.1/posixstat.h 2019-12-19 11:24:37.000000000 -0500 ++++ readline-8.1.1/posixstat.h 2020-12-19 07:54:28.888704198 -0500 @@ -78,30 +78,44 @@ #if defined (S_IFBLK) && !defined (S_ISBLK) @@ -94,7 +84,7 @@ #endif /* -@@ -137,6 +151,8 @@ +@@ -157,6 +171,8 @@ /* These are non-standard, but are used in builtins.c$symbolic_umask() */ #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) @@ -103,4 +93,3 @@ +#endif #endif /* _POSIXSTAT_H_ */ -
--- a/src/readline-1-input.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/readline-1-input.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,7 +1,7 @@ -diff -ur readline-8.0.disp/input.c readline-8.0/input.c ---- readline-8.0.disp/input.c 2019-03-20 07:56:04.897036396 -0400 -+++ readline-8.0/input.c 2019-03-20 08:00:45.403401856 -0400 -@@ -519,7 +519,12 @@ +diff -ur readline-8.1.1/input.c readline-8.1.2/input.c +--- readline-8.1.1/input.c 2020-12-19 07:54:06.883500144 -0500 ++++ readline-8.1.2/input.c 2020-12-19 07:55:29.042995655 -0500 +@@ -538,7 +538,12 @@ #if defined (__MINGW32__) if (isatty (fileno (stream)))
--- a/src/readline-1-sigwinch.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/readline-1-sigwinch.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,9 +1,7 @@ -Common subdirectories: readline-8.0.input/doc and readline-8.0/doc -Common subdirectories: readline-8.0.input/examples and readline-8.0/examples -diff -u readline-8.0.input/readline.c readline-8.0/readline.c ---- readline-8.0.input/readline.c 2019-03-20 08:02:03.533512025 -0400 -+++ readline-8.0/readline.c 2019-03-20 08:06:59.117185446 -0400 -@@ -1103,8 +1103,12 @@ +diff -ur readline-8.1.2/readline.c readline-8.1.3/readline.c +--- readline-8.1.2/readline.c 2020-12-19 07:55:06.477760951 -0500 ++++ readline-8.1.3/readline.c 2020-12-19 07:56:17.722659252 -0500 +@@ -1154,8 +1154,12 @@ RL_SETSTATE(RL_STATE_INITIALIZED); } else @@ -18,10 +16,10 @@ /* Initialize the current line information. */ _rl_init_line_state (); -Common subdirectories: readline-8.0.input/shlib and readline-8.0/shlib -diff -u readline-8.0.input/signals.c readline-8.0/signals.c ---- readline-8.0.input/signals.c 2019-03-20 08:02:03.529511918 -0400 -+++ readline-8.0/signals.c 2019-03-20 08:13:44.347195350 -0400 +Only in readline-8.1.3: readline.c.orig +diff -ur readline-8.1.2/signals.c readline-8.1.3/signals.c +--- readline-8.1.2/signals.c 2020-12-19 07:55:06.471760622 -0500 ++++ readline-8.1.3/signals.c 2020-12-19 08:19:50.548964783 -0500 @@ -46,6 +46,11 @@ #include "rlprivate.h" @@ -43,7 +41,18 @@ int rl_catch_sigwinch = 1; #else int rl_catch_sigwinch = 0; /* for the readline state struct in readline.c */ -@@ -495,6 +500,21 @@ +@@ -266,8 +271,10 @@ + case SIGQUIT: + #endif + ++#if defined (HAVE_POSIX_SIGNALS) + if (block_sig) + sigprocmask (SIG_BLOCK, &set, &oset); ++#endif + + rl_echo_signal_char (sig); + rl_cleanup_after_signal (); +@@ -532,6 +539,21 @@ } #endif /* SIGWINCH */ @@ -65,7 +74,7 @@ return 0; } -@@ -545,6 +565,20 @@ +@@ -582,6 +604,20 @@ sigwinch_set_flag = 0; } #endif @@ -86,4 +95,3 @@ return 0; } -Common subdirectories: readline-8.0.input/support and readline-8.0/support
--- a/src/readline-2-event-hook.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/readline-2-event-hook.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,7 +1,7 @@ -diff -ur readline-8.0.sigwinch/input.c readline-8.0/input.c ---- readline-8.0.sigwinch/input.c 2019-03-20 08:15:55.450361377 -0400 -+++ readline-8.0/input.c 2019-03-20 08:30:58.059756179 -0400 -@@ -140,6 +140,11 @@ +diff -ur readline-8.1.3/input.c readline-8.1.4/input.c +--- readline-8.1.3/input.c 2020-12-19 07:56:01.572775578 -0500 ++++ readline-8.1.4/input.c 2020-12-19 07:57:24.608319024 -0500 +@@ -142,6 +142,11 @@ static unsigned char ibuffer[512]; static int ibuffer_len = sizeof (ibuffer) - 1; @@ -13,7 +13,7 @@ #define any_typein (push_index != pop_index) int -@@ -266,7 +271,7 @@ +@@ -268,7 +273,7 @@ #if defined (__MINGW32__) /* Use getch/_kbhit to check for available console input, in the same way that we read it normally. */ @@ -22,7 +22,7 @@ result = 0; #endif -@@ -501,6 +506,120 @@ +@@ -520,6 +525,120 @@ return (c); } @@ -143,7 +143,7 @@ int rl_getc (FILE *stream) { -@@ -520,9 +639,9 @@ +@@ -539,9 +658,9 @@ #if defined (__MINGW32__) if (isatty (fileno (stream))) {
--- a/src/readline-2-history.patch Sun Apr 25 17:47:04 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -diff -ur readline-8.0.eventhook/histfile.c readline-8.0/histfile.c ---- readline-8.0.eventhook/histfile.c 2019-04-03 10:21:42.916563353 -0400 -+++ readline-8.0/histfile.c 2019-04-03 16:16:04.605404093 -0400 -@@ -107,6 +107,11 @@ - # define PATH_MAX 1024 /* default */ - #endif - -+#if defined(_WIN32) -+ #define WIN32_LEAN_AND_MEAN -+ #include <windows.h> -+#endif -+ - extern void _hs_append_history_line PARAMS((int, const char *)); - - /* history file version; currently unused */ -@@ -139,6 +144,19 @@ - static int histfile_backup PARAMS((const char *, const char *)); - static int histfile_restore PARAMS((const char *, const char *)); - -+static int -+history_rename(const char *from, const char *to) -+{ -+#if defined(_WIN32) -+ if (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)) { -+ return -1; -+ } -+ return 0; -+#else -+ return rename(from, to); -+#endif -+} -+ - /* Return the string that should be used in the place of this - filename. This only matters when you don't specify the - filename to read_history (), or write_history (). */ -@@ -448,10 +466,10 @@ - if ((n = readlink (filename, linkbuf, sizeof (linkbuf) - 1)) > 0) - { - linkbuf[n] = '\0'; -- return (rename (linkbuf, back)); -+ return (history_rename (linkbuf, back)); - } - #endif -- return (rename (filename, back)); -+ return (history_rename (filename, back)); - } - - /* Restore ORIG from BACKUP handling case where ORIG is a symlink -@@ -467,10 +485,10 @@ - if ((n = readlink (orig, linkbuf, sizeof (linkbuf) - 1)) > 0) - { - linkbuf[n] = '\0'; -- return (rename (backup, linkbuf)); -+ return (history_rename (backup, linkbuf)); - } - #endif -- return (rename (backup, orig)); -+ return (history_rename (backup, orig)); - } - - /* Truncate the history file FNAME, leaving only LINES trailing lines.
--- a/src/readline.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/readline.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.0 -$(PKG)_CHECKSUM := d58041c2143595dc001d2777ae9a200be30198b0 +$(PKG)_VERSION := 8.1 +$(PKG)_CHECKSUM := 48c5e0c3a212449e206e21ba82856accac842c6f $(PKG)_SUBDIR := readline-$($(PKG)_VERSION) $(PKG)_FILE := readline-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/readline/$($(PKG)_FILE)
--- a/src/release-octave.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/release-octave.mk Sun Apr 25 18:31:10 2021 +0200 @@ -221,6 +221,7 @@ if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \ cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ + cp '$(1)/.build/src/.libs/octave-svgconvert.exe' '$(3)$(HOST_BINDIR)'; \ if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
--- a/src/sdl.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/sdl.mk Sun Apr 25 18:31:10 2021 +0200 @@ -10,11 +10,11 @@ $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE) $(PKG)_DEPS := libiconv +# SDL1 is no longer updated, so wont see any new versions +# TODO: create a SDL2 target if we want to use that define $(PKG)_UPDATE - $(WGET) -q -O- 'http://hg.libsdl.org/SDL/tags' | \ - $(SED) -n 's,.*release-\([0-9][^<]*\).*,\1,p' | \ - $(GREP) "^1" | \ - head -1 + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) endef ifeq ($(MXE_NATIVE_BUILD),no)
--- a/src/sqlite.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/sqlite.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,11 +3,11 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3330000 -$(PKG)_CHECKSUM := d63f3ce52cb295d62d09fc2ad8f2d29c35e1645f +$(PKG)_VERSION := 3350500 +$(PKG)_CHECKSUM := f6875472fc86c679400ede139d1dfc6937003abc $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.sqlite.org/2020/$($(PKG)_FILE) +$(PKG)_URL := http://www.sqlite.org/2021/$($(PKG)_FILE) $(PKG)_DEPS := readline zlib ifeq ($(MXE_SYSTEM),mingw)
--- a/src/stable-octave.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/stable-octave.mk Sun Apr 25 18:31:10 2021 +0200 @@ -200,6 +200,7 @@ if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \ cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ + cp '$(1)/.build/src/.libs/octave-svgconvert.exe' '$(3)$(HOST_BINDIR)'; \ if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
--- a/src/sundials-ida.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/sundials-ida.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,11 +3,11 @@ PKG := sundials-ida $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.0 -$(PKG)_CHECKSUM := a33d5a9f19fad4e4a257a8c9ae1c321550885996 +$(PKG)_VERSION := 5.7.0 +$(PKG)_CHECKSUM := c04ecc9102851955b62e626a43ad5f604e890ab0 $(PKG)_SUBDIR := sundials-$($(PKG)_VERSION) $(PKG)_FILE := sundials-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://computation.llnl.gov/projects/sundials/download/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/LLNL/sundials/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := lapack suitesparse ifeq ($(USE_SYSTEM_GCC),no) $(PKG)_DEPS += libgomp
--- a/src/tiff.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/tiff.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := tiff $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0 -$(PKG)_CHECKSUM := 7a882f8d55fd0620cbf89c47994d2d1d3b975452 +$(PKG)_VERSION := 4.2.0 +$(PKG)_CHECKSUM := 400ff865beb34499633dd1095fe438995e6da707 $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/tinyxml-1-cmakelists.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,22 @@ +diff -burN tinyxml.orig/CMakeLists.txt tinyxml/CMakeLists.txt +--- tinyxml.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ tinyxml/CMakeLists.txt 2015-06-21 19:03:09.878168410 +0200 +@@ -0,0 +1,18 @@ ++cmake_minimum_required(VERSION 2.8) ++ ++file(GLOB SRCS "${CMAKE_SOURCE_DIR}/tiny*.cpp" ) ++ ++include_directories(${CMAKE_SOURCE_DIR}) ++add_definitions(-DTIXML_USE_STL) ++ ++add_library(tinyxml ${SRCS}) ++ ++install(TARGETS tinyxml ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/*.h") ++install(FILES ${HEADERS} ++ DESTINATION include) ++
--- a/src/tinyxml.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/tinyxml.mk Sun Apr 25 18:31:10 2021 +0200 @@ -17,13 +17,23 @@ endef define $(PKG)_BUILD - cd '$(1)' && $(MXE_CXX) -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp - cd '$(1)' && $(MXE_AR) cr libtinyxml.a *.o - $(MXE_RANLIB) '$(1)/libtinyxml.a' - $(INSTALL) -d '$(HOST_LIBDIR)' - $(INSTALL) -m644 '$(1)'/*.a '$(HOST_LIBDIR)' - $(INSTALL) -d '$(HOST_INCDIR)' - $(INSTALL) -m644 '$(1)'/*.h '$(HOST_INCDIR)' + mkdir '$(1)/.build' + cd '$(1)/.build' && cmake '$(1)' \ + -DCMAKE_INSTALL_PREFIX=$(HOST_PREFIX) \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + + $(MAKE) -C '$(1)/.build' install + +# cd '$(1)' && $(MXE_CXX) -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp +# cd '$(1)' && $(MXE_AR) cr libtinyxml.a *.o +# $(MXE_RANLIB) '$(1)/libtinyxml.a' +# $(INSTALL) -d '$(HOST_LIBDIR)' +# $(INSTALL) -m644 '$(1)'/*.a '$(HOST_LIBDIR)' +# $(INSTALL) -d '$(HOST_INCDIR)' +# $(INSTALL) -m644 '$(1)'/*.h '$(HOST_INCDIR)' #'$(MXE_CXX)' \ # -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \
--- a/src/transfig-1-fixes.patch Sun Apr 25 17:47:04 2021 +0200 +++ b/src/transfig-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -1,47 +1,61 @@ -diff -ur fig2dev-3.2.7a.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.7a/fig2dev/dev/genbitmaps.c ---- fig2dev-3.2.7a.orig/fig2dev/dev/genbitmaps.c 2018-10-19 15:28:40.513608360 -0400 -+++ fig2dev-3.2.7a/fig2dev/dev/genbitmaps.c 2018-10-19 15:30:51.900907004 -0400 -@@ -232,8 +232,9 @@ - if (to) - sprintf(com + n, " >'%s'", to); +diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8/fig2dev/dev/genbitmaps.c +--- fig2dev-3.2.8.orig/fig2dev/dev/genbitmaps.c 2020-12-24 07:58:17.831822681 -0500 ++++ fig2dev-3.2.8/fig2dev/dev/genbitmaps.c 2020-12-24 07:59:41.971440443 -0500 +@@ -493,8 +493,9 @@ + err_msg("Cannot write command for conversion to bitmap"); + BITMAP_EXIT_FAILURE; } - +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, bitmaps_broken_pipe); +#endif - if ((tfp = popen(com, "w")) == 0) { - fprintf(stderr, "fig2dev: Can't open pipe to ghostscript\n"); + if ((tfp = popen(com, "w")) == NULL) { + fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); fprintf(stderr, "command was: %s\n", com); -@@ -275,7 +276,9 @@ +@@ -534,8 +535,9 @@ status = pclose(tfp); - tfp = 0; /* Otherwise main() tries to close tfp again */ -+#if ! defined (__WIN32__) || defined (__CYGWIN__) + tfp = NULL; /* Otherwise main() tries to close tfp again */ ++#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, SIG_DFL); +- ++#endif + if (status != 0) { + FILE *f; + +diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genemf.h fig2dev-3.2.8/fig2dev/dev/genemf.h +--- fig2dev-3.2.8.orig/fig2dev/dev/genemf.h 2020-12-24 07:58:17.831822681 -0500 ++++ fig2dev-3.2.8/fig2dev/dev/genemf.h 2020-12-24 08:06:13.519929445 -0500 +@@ -30,7 +30,9 @@ + #include "config.h" + #endif + ++#if !defined (__WIN32__) || defined (__CYGWIN__) + #include <endian.h> +#endif - if (status != 0) { - fputs("Error in ghostcript or netpbm command\n", stderr); -diff -ur fig2dev-3.2.7a.orig/fig2dev/dev/genpdf.c fig2dev-3.2.7a/fig2dev/dev/genpdf.c ---- fig2dev-3.2.7a.orig/fig2dev/dev/genpdf.c 2018-10-19 15:28:40.509608259 -0400 -+++ fig2dev-3.2.7a/fig2dev/dev/genpdf.c 2018-10-19 15:31:31.761906076 -0400 -@@ -95,7 +95,9 @@ - "-dAutoFilterColorImages=false -dColorImageFilter=/DCTEncode " - "-sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -o '%s' -", - GSEXE, ofile); + typedef unsigned char uchar; + typedef unsigned short TCHAR; +diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8/fig2dev/dev/genpdf.c +--- fig2dev-3.2.8.orig/fig2dev/dev/genpdf.c 2020-12-24 07:58:17.831822681 -0500 ++++ fig2dev-3.2.8/fig2dev/dev/genpdf.c 2020-12-24 08:01:13.368456502 -0500 +@@ -111,7 +111,9 @@ + exit(EXIT_FAILURE); + } + +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, pdf_broken_pipe); +#endif if ((tfp = popen(com, "w")) == 0) { - fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); - fprintf(stderr, "command was: %s\n", com); -@@ -125,7 +127,9 @@ - free(com); - return -1; + err_msg("fig2dev: Cannot open pipe to ghostscript"); + put_msg("Command was: %s", com); +@@ -145,7 +147,9 @@ + err_msg("Error in ghostcript command,\n %s", com); + status = -1; + } else { ++#if !defined (__WIN32__) || defined (__CYGWIN__) + (void)signal(SIGPIPE, SIG_DFL); ++#endif } -+#if !defined (__WIN32__) || defined (__CYGWIN__) - (void) signal(SIGPIPE, SIG_DFL); -+#endif - free(com); - return 0; + if (com != com_buf)
--- a/src/transfig.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/transfig.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := transfig $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.7b -$(PKG)_CHECKSUM := 8097c178b7fff1023112250938cc87837c0f564e +$(PKG)_VERSION := 3.2.8 +$(PKG)_CHECKSUM := 6a4714b653d98734dcfd3d24e6bdf091c2e20195 $(PKG)_SUBDIR := fig2dev-$($(PKG)_VERSION) $(PKG)_FILE := fig2dev-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mcj/$($(PKG)_FILE)
--- a/src/units.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/units.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,8 +3,8 @@ PKG := units $(PKG)_IGNORE := -$(PKG)_VERSION := 2.19 -$(PKG)_CHECKSUM := 8c241b04046cafa4a4503dc3567d8d869b46329c +$(PKG)_VERSION := 2.21 +$(PKG)_CHECKSUM := a897e639111c9400737b68ec22e5f70eaf5d7253 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/wxwidgets-1-fixes.patch Sun Apr 25 18:31:10 2021 +0200 @@ -0,0 +1,192 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji <djcj@gmx.de> +Date: Fri, 26 May 2017 09:33:22 +0200 +Subject: [PATCH 1/2] make it possible to install DLLs into $(libdir)/../bin + + +diff --git a/Makefile.in b/Makefile.in +index 1111111..2222222 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -15523,7 +15523,7 @@ distclean: clean + @COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname) + @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_1_SHARED_1@uninstall_monodll: +@@ -15558,7 +15558,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll: +@@ -15595,7 +15595,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll: +@@ -15632,7 +15632,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll: +@@ -15669,7 +15669,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll: +@@ -15706,7 +15706,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll: +@@ -15743,7 +15743,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll: +@@ -15780,7 +15780,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@install_webviewdll: $(__webviewdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@uninstall_webviewdll: +@@ -15817,7 +15817,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll: +@@ -15854,7 +15854,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll: +@@ -15891,7 +15891,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll: +@@ -15928,7 +15928,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll: +@@ -15965,7 +15965,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@install_ribbondll: $(__ribbondll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@uninstall_ribbondll: +@@ -16002,7 +16002,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@uninstall_propgriddll: +@@ -16039,7 +16039,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll: +@@ -16076,7 +16076,7 @@ distclean: clean + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname) + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) + + @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@uninstall_stcdll: +@@ -16113,7 +16113,7 @@ distclean: clean + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd)) + + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@uninstall_gldll: + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Maarten Bent <MaartenBent@users.noreply.github.com> +Date: Thu, 16 Aug 2018 20:08:56 +0200 +Subject: [PATCH 2/2] Fix c++11-narrowing error when using clang on Windows + +Case value 0xfffffd9f results in the following error: +error: case value evaluates to 4294966687, which cannot be narrowed to type +'DISPID' (aka 'long') [-Wc++11-narrowing] + +diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp +index 1111111..2222222 100644 +--- a/src/msw/mediactrl_am.cpp ++++ b/src/msw/mediactrl_am.cpp +@@ -2179,7 +2179,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), + //--------------------------------------------------------------------------- + void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event) + { +- switch(event.GetDispatchId()) ++ // cast to unsigned long to fix narrowing error with case 0xfffffd9f ++ // when using clang ++ switch (static_cast<unsigned long>(event.GetDispatchId())) + { + #ifndef __WXWINCE__ + case 0x00000001: // statechange in IActiveMovie
--- a/src/zeromq.mk Sun Apr 25 17:47:04 2021 +0200 +++ b/src/zeromq.mk Sun Apr 25 18:31:10 2021 +0200 @@ -3,12 +3,12 @@ PKG := zeromq $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3.1 -$(PKG)_CHECKSUM := 6cce22d830eaf95feff7cab00744df13ad7ab7f3 +$(PKG)_VERSION := 4.3.4 +$(PKG)_CHECKSUM := 47277a64749049123d1401600e8cfbab10a3ae28 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://github.com/$(PKG)/libzmq/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := pthreads +$(PKG)_DEPS := pthreads libsodium define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/zeromq/libzmq/tags' | \ @@ -20,8 +20,10 @@ cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --without-libsodium \ + --disable-perf \ + --with-libsodium \ $(ENABLE_SHARED_OR_STATIC) + $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' endef