[mingw-nsis: 21/27] * Thu Sep 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.46-3 - Make plugins not depend on libstd

[Kalev Lember]

commit 7ee9c515be054ae40fec88e2badd0b603fc7fea0
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Sep 8 17:48:12 2011 +0200

    * Thu Sep 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.46-3
    - Make plugins not depend on libstdc++-6.dll (#734905)

 mingw32-nsis.spec                |    8 +++++++-
 nsis-2.46-static-libstdc++.patch |   11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-nsis.spec b/mingw32-nsis.spec
index fdc91fe..8a47003 100644
--- a/mingw32-nsis.spec
+++ b/mingw32-nsis.spec
@@ -3,7 +3,7 @@
 
 Name:           mingw32-nsis
 Version:        2.46
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nullsoft Scriptable Install System
 
 License:        zlib and CPL
@@ -19,6 +19,8 @@ Patch0:         nsis-2.43-64bit-fixes.patch
 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
+# Make plugins not depend on libstdc++-6.dll (#734905)
+Patch3:         nsis-2.46-static-libstdc++.patch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
@@ -61,6 +63,7 @@ all plugins.
 %patch0 -p1 -b .64bit
 %patch1 -p1 -b .rpmopt
 %patch2 -p1 -b .static-libgcc
+%patch3 -p1 -b .static-libstdc++
 
 
 %build
@@ -90,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.46-3
+- Make plugins not depend on libstdc++-6.dll (#734905)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.46-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/nsis-2.46-static-libstdc++.patch b/nsis-2.46-static-libstdc++.patch
new file mode 100644
index 0000000..8bd7702
--- /dev/null
+++ b/nsis-2.46-static-libstdc++.patch
@@ -0,0 +1,11 @@
+diff -u a/SCons/Config/gnu b/SCons/Config/gnu
+--- a/SCons/Config/gnu
++++ b/SCons/Config/gnu
+@@ -118,6 +118,7 @@
+ 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
++plugin_env.Append(LINKFLAGS = ['-static-libstdc++'])
+ 
+ ### cross-platform util environment
+