rpms/mingw32-nsis/devel nsis-2.43-rpm-opt.patch, NONE, 1.1 mingw32-nsis.spec, 1.3, 1.4

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/mingw32-nsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22008/devel

Modified Files:
	mingw32-nsis.spec 
Added Files:
	nsis-2.43-rpm-opt.patch 
Log Message:
* Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-5
- Use RPM_OPT_FLAGS for the natively-built parts

nsis-2.43-rpm-opt.patch:

--- NEW FILE nsis-2.43-rpm-opt.patch ---
diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu
--- nsis-2.43-src-debian-debug-opt/SCons/Config/gnu	2009-02-25 08:35:01.000000000 +0100
+++ nsis-2.43-src-rpm-opt/SCons/Config/gnu	2009-02-25 08:50:15.000000000 +0100
@@ -1,5 +1,7 @@
 print "Using GNU tools configuration"
 
+import os
+
 Import('defenv')
 
 ### imports
@@ -95,7 +97,7 @@
 	makensis_env.Append(LINKFLAGS = '-g')             # debugging
 	makensis_env.Append(CCFLAGS = '-g')               # debugging
 if not defenv['DEBUG'] and defenv['OPT']:
-	makensis_env.Append(CCFLAGS = ['-O2'])            # optimize
+	makensis_env.Append(CCFLAGS = [os.getenv('RPM_OPT_FLAGS')])            # optimize
 makensis_env.Append(CFLAGS = ['-Wall'])                   # all warnings
 makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
 makensis_env.Append(CXXFLAGS = ['-Wall'])                 # all warnings
@@ -135,7 +137,7 @@
 	cp_util_env.Append(LINKFLAGS = '-g')        # debugging
 	cp_util_env.Append(CCFLAGS = '-g')          # debugging
 if not defenv['DEBUG'] and defenv['OPT']:
-	cp_util_env.Append(CCFLAGS = ['-O2'])             # optimize
+	cp_util_env.Append(CCFLAGS = [os.getenv('RPM_OPT_FLAGS')])             # optimize
 cp_util_env.Append(CCFLAGS = ['-Wall'])             # all warnings
 cp_util_env.Append(CCFLAGS = ['-fno-strict-aliasing']) # not safe for strict aliasing
 


Index: mingw32-nsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsis/devel/mingw32-nsis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-nsis.spec	25 Feb 2009 07:22:15 -0000	1.3
+++ mingw32-nsis.spec	25 Feb 2009 07:52:43 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           mingw32-nsis
 Version:        2.43
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Nullsoft Scriptable Install System
 
 License:        zlib and CPL
@@ -17,6 +17,8 @@
 Patch0:         nsis-2.43-64bit-fixes.patch
 # Patches from Debian (mainly by Paul Wise).
 Patch1:         nsis-2.43-debian-debug-opt.patch
+# Use RPM_OPT_FLAGS for the natively-built parts
+Patch2:         nsis-2.43-rpm-opt.patch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
@@ -59,6 +61,7 @@
 
 %patch0 -p1 -b .64bit
 %patch1 -p1 -b .debug
+%patch2 -p1 -b .rpmopt
 
 
 %build
@@ -88,6 +91,9 @@
 
 
 %changelog
+* Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-5
+- Use RPM_OPT_FLAGS for the natively-built parts
+
 * Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-4
 - Updated 64bit-fixes patch (remove some more -m32 use).
 - Drop ExclusiveArch, not needed with the above.