[mingw-nsis: 17/27] - Make plugins not depend on libgcc_s_sjlj-1.dll (#553971)

[Kalev Lember]

commit fb99389bac7725be449f9d618a1b85c62a050d5a
Author: Kevin Kofler <kkofler at fedoraproject.org>
Date:   Mon Jan 11 07:22:16 2010 +0000

    - Make plugins not depend on libgcc_s_sjlj-1.dll (#553971)

 mingw32-nsis.spec             |    8 +++++++-
 nsis-2.45-static-libgcc.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-nsis.spec b/mingw32-nsis.spec
index 3d15c41..fc9222c 100644
--- a/mingw32-nsis.spec
+++ b/mingw32-nsis.spec
@@ -3,7 +3,7 @@
 
 Name:           mingw32-nsis
 Version:        2.45
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nullsoft Scriptable Install System
 
 License:        zlib and CPL
@@ -17,6 +17,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         nsis-2.43-64bit-fixes.patch
 # Use RPM_OPT_FLAGS for the natively-built parts
 Patch1:         nsis-2.43-rpm-opt.patch
+# Make plugins not depend on libgcc_s_sjlj-1.dll (#553971)
+Patch2:         nsis-2.45-static-libgcc.patch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
@@ -58,6 +60,7 @@ all plugins.
 
 %patch0 -p1 -b .64bit
 %patch1 -p1 -b .rpmopt
+%patch2 -p1 -b .static-libgcc
 
 
 %build
@@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 11 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.45-3
+- Make plugins not depend on libgcc_s_sjlj-1.dll (#553971)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.45-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/nsis-2.45-static-libgcc.patch b/nsis-2.45-static-libgcc.patch
new file mode 100644
index 0000000..0ad2f97
--- /dev/null
+++ b/nsis-2.45-static-libgcc.patch
@@ -0,0 +1,12 @@
+diff --git a/SCons/Config/gnu b/SCons/Config/gnu
+index 7b64ccc..ef9e94b 100755
+--- a/SCons/Config/gnu
++++ b/SCons/Config/gnu
+@@ -117,6 +117,7 @@ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']:
+ plugin_env.Append(LINKFLAGS = ['-mwindows'])        # build windows executables
+ plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])      # 512 bytes align
+ plugin_env.Append(LINKFLAGS = ['$MAP_FLAG'])        # generate map file
++plugin_env.Append(LINKFLAGS = ['-static-libgcc'])   # remove libgcc*.dll dependency
+ 
+ ### cross-platform util environment
+