rpms/mingw32-nsis/devel nsis-2.45-static-libgcc.patch, NONE, 1.1 mingw32-nsis.spec, 1.11, 1.12
Kevin Kofler
kkofler at fedoraproject.org
Mon Jan 11 07:22:16 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/mingw32-nsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12476/devel
Modified Files:
mingw32-nsis.spec
Added Files:
nsis-2.45-static-libgcc.patch
Log Message:
* 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)
nsis-2.45-static-libgcc.patch:
gnu | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE nsis-2.45-static-libgcc.patch ---
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
Index: mingw32-nsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsis/devel/mingw32-nsis.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-nsis.spec 25 Jul 2009 14:26:44 -0000 1.11
+++ mingw32-nsis.spec 11 Jan 2010 07:22:16 -0000 1.12
@@ -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}-%{ve
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
More information about the scm-commits
mailing list