From 949f20243079c6a1de00f5d623700a9f003622e9 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Sat, 28 Feb 2015 11:14:40 -0800 Subject: [PATCH] use jldownload in winrpm.sh, remove trailing / from opensuse url --- Makefile | 4 ++-- contrib/windows/winrpm.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cf9578968288c..0bb22004d2c6f 100644 --- a/Makefile +++ b/Makefile @@ -517,7 +517,7 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686)) cd dist-extras && \ $(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z920.exe && \ 7z x -y 7z920.exe 7z.exe 7z.dll && \ - ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/ \ + ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1 \ "mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1" else ifeq ($(ARCH),x86_64) cd dist-extras && \ @@ -525,7 +525,7 @@ else ifeq ($(ARCH),x86_64) 7z x -y 7z920-x64.msi _7z.exe _7z.dll && \ mv _7z.dll 7z.dll && \ mv _7z.exe 7z.exe && \ - ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1/ \ + ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1 \ "mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1" else $(error no win-extras target for ARCH=$(ARCH)) diff --git a/contrib/windows/winrpm.sh b/contrib/windows/winrpm.sh index 80e81cab17426..ec07a8c7ff86d 100755 --- a/contrib/windows/winrpm.sh +++ b/contrib/windows/winrpm.sh @@ -83,7 +83,7 @@ for i in $toinstall; do checksum=$(echo $pkgi | $xp "/package/checksum/text()" -) eval $(echo $pkgi | $xp "/package/location/@href" -) echo "downloading $href" - retry_curl $url/$href > $href + ../deps/jldownload $href $url/$href echo "$checksum *$href" | sha256sum -c 7z x -y $href cpiofile=$(basename $href | sed 's/.rpm$/.cpio/')