From 00242a40b056650f9b95f632486dbb3c6329f28e Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Tue, 23 Jun 2015 11:07:07 -0700 Subject: [PATCH] Reinstate gcc dlls from opensuse Cygwin's mingw-w64 package was rebuilt for --enable-dynamic-string, so now using julia built with cygwin's mingw works again with gcc dlls from opensuse, but we do need opensuse gcc dlls to work with winrpm packages --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 689ef853d98f7..a90c9c0a42c2c 100644 --- a/Makefile +++ b/Makefile @@ -343,7 +343,7 @@ ifeq ($(OS), WINNT) -rm -f $(DESTDIR)$(private_libdir)/sys.$(SHLIB_EXT) [ ! -d dist-extras ] || ( cd dist-extras && \ - cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(bindir) && \ + cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll libgfortran-3.dll libquadmath-0.dll libstdc++-6.dll libgcc_s_s*-1.dll libssp-0.dll $(bindir) && \ mkdir $(DESTDIR)$(prefix)/Git && \ 7z x PortableGit.7z -o"$(DESTDIR)$(prefix)/Git" && \ echo "[core] eol = lf" >> "$(DESTDIR)$(prefix)/Git/etc/gitconfig" && \ @@ -453,7 +453,7 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686)) $(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 \ - "mingw32-libexpat1 mingw32-zlib1" && \ + "mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1" && \ cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll . else ifeq ($(ARCH),x86_64) cd dist-extras && \ @@ -462,7 +462,7 @@ else ifeq ($(ARCH),x86_64) 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 \ - "mingw64-libexpat1 mingw64-zlib1" && \ + "mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1" && \ cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll . else $(error no win-extras target for ARCH=$(ARCH))