Skip to content

Commit b867796

Browse files
committed
Use openSUSE 42.2 instead of 13.2 for winrpm binaries
13.2 is ending support soon (cherry picked from commit 022a60c) ref #20152
1 parent 0b120b1 commit b867796

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
602602
cd $(JULIAHOME)/dist-extras && \
603603
$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z920.exe && \
604604
7z x -y 7z920.exe 7z.exe 7z.dll && \
605-
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.2 \
605+
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_42.2 \
606606
"mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libwinpthread1 mingw32-libexpat1 mingw32-zlib1" && \
607607
cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll .
608608
else ifeq ($(ARCH),x86_64)
@@ -611,7 +611,7 @@ else ifeq ($(ARCH),x86_64)
611611
7z x -y 7z920-x64.msi _7z.exe _7z.dll && \
612612
mv _7z.dll 7z.dll && \
613613
mv _7z.exe 7z.exe && \
614-
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.2 \
614+
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_42.2 \
615615
"mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libwinpthread1 mingw64-libexpat1 mingw64-zlib1" && \
616616
cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll .
617617
else

contrib/windows/get_toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ case $bits in
2727
;;
2828
esac
2929
echo "Downloading $host toolchain, check $PWD/get_toolchain.log for full output"
30-
contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win$bits/openSUSE_13.2 \
30+
contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win$bits/openSUSE_42.2 \
3131
"mingw$bits-gcc mingw$bits-gcc-c++ mingw$bits-gcc-fortran \
3232
mingw$bits-libssp0 mingw$bits-libstdc++6 mingw$bits-libgfortran3" > get_toolchain.log
3333

0 commit comments

Comments
 (0)