From b86878e458d5d7deb21218ce6598b98af4ed7ec2 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 19 Dec 2018 17:50:33 +0100 Subject: windows-libs: include missing gcc libs for GnuTLS Tested in a clean Win7 SP1 x64 image. --- windows-libs/make-gnutls-libs-zip.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'windows-libs/make-gnutls-libs-zip.sh') diff --git a/windows-libs/make-gnutls-libs-zip.sh b/windows-libs/make-gnutls-libs-zip.sh index 4ced819..61d7d79 100755 --- a/windows-libs/make-gnutls-libs-zip.sh +++ b/windows-libs/make-gnutls-libs-zip.sh @@ -12,12 +12,14 @@ umask 22 # https://src.fedoraproject.org/rpms/mingw-gnutls/blob/f29/f/mingw-gnutls.spec # https://apps.fedoraproject.org/packages/mingw64-gnutls # -# parse-fedorarepo.py --ignore gcc --ignore gcc-c++ --ignore crt --ignore pkg-config --release 29 mingw64-gnutls mingw32-gnutls -# If gcc is not ignored (for libgcc_s_seh-1.dll), do use --ignore binutils --ignore cpp --ignore headers +# parse-fedorarepo.py --ignore binutils --ignore cpp --ignore headers --ignore gcc-c++ --ignore crt --ignore pkg-config --release 29 mingw64-gnutls mingw32-gnutls --downloadUsing cached file repomd.xml # # Dependency tree: # + mingw64-gnutls 3.6.3-1.fc29.noarch +# + mingw64-gcc (mingw64(libgcc_s_seh-1.dll)) 8.2.0-3.fc29.x86_64 +# + mingw64-winpthreads (mingw64(libwinpthread-1.dll)) # + mingw64-gmp (mingw64(libgmp-10.dll)) 6.1.2-4.fc29.noarch +# + mingw64-gcc (mingw64(libgcc_s_seh-1.dll)) # + mingw64-nettle (mingw64(libhogweed-4.dll)) 3.4-2.fc29.noarch # + mingw64-gmp (mingw64(libgmp-10.dll)) # + mingw64-nettle (mingw64(libnettle-6.dll)) @@ -28,21 +30,26 @@ umask 22 # + mingw64-winpthreads (mingw64(libwinpthread-1.dll)) 5.0.4-2.fc29.noarch # + mingw64-libtasn1 # + mingw32-gnutls 3.6.3-1.fc29.noarch +# + mingw32-gcc (mingw32(libgcc_s_sjlj-1.dll)) 8.2.0-3.fc29.x86_64 +# + mingw32-winpthreads (mingw32(libwinpthread-1.dll)) # + mingw32-gmp (mingw32(libgmp-10.dll)) 6.1.2-4.fc29.noarch +# + mingw32-gcc (mingw32(libgcc_s_sjlj-1.dll)) # + mingw32-nettle (mingw32(libhogweed-4.dll)) 3.4-2.fc29.noarch +# + mingw32-gcc (mingw32(libgcc_s_sjlj-1.dll)) # + mingw32-gmp (mingw32(libgmp-10.dll)) # + mingw32-nettle (mingw32(libnettle-6.dll)) # + mingw32-p11-kit (mingw32(libp11-kit-0.dll)) 0.23.7-5.fc29.noarch # + mingw32-libffi (mingw32(libffi-6.dll)) 3.1-4.fc29.noarch +# + mingw32-gcc (mingw32(libgcc_s_sjlj-1.dll)) # + mingw32-libtasn1 (mingw32(libtasn1-6.dll)) # + mingw32-libtasn1 (mingw32(libtasn1-6.dll)) 4.13-3.fc29.noarch +# + mingw32-gcc (mingw32(libgcc_s_sjlj-1.dll)) # + mingw32-winpthreads (mingw32(libwinpthread-1.dll)) 5.0.4-2.fc29.noarch # + mingw32-libtasn1 -# Skipping this as it should be included with the glib package: -# + mingw64-gcc (mingw64(libgcc_s_seh-1.dll)) 8.2.0-3.fc29.x86_64 # urls=( https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-gnutls-3.6.3-1.fc29.noarch.rpm +https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-gcc-8.2.0-3.fc29.x86_64.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-gmp-6.1.2-4.fc29.noarch.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-nettle-3.4-2.fc29.noarch.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm @@ -50,6 +57,7 @@ https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Pac https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-libtasn1-4.13-3.fc29.noarch.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw32-gnutls-3.6.3-1.fc29.noarch.rpm +https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw32-gcc-8.2.0-3.fc29.x86_64.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw32-gmp-6.1.2-4.fc29.noarch.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw32-nettle-3.4-2.fc29.noarch.rpm https://mirror.nl.leaseweb.net/fedora/linux/releases/29/Everything/x86_64/os/Packages/m/mingw32-p11-kit-0.23.7-5.fc29.noarch.rpm @@ -80,6 +88,7 @@ for url in "${urls[@]}"; do done sha256sum --check <