[mingw-nsis: 6/27] - Use RPM_OPT_FLAGS for the natively-built parts

[Kalev Lember]

commit 05ba69ee77326463bae80405906e5045d8fe82eb
Author: Kevin Kofler <kkofler at fedoraproject.org>
Date:   Wed Feb 25 07:52:43 2009 +0000

    - Use RPM_OPT_FLAGS for the natively-built parts

 mingw32-nsis.spec       |    8 +++++++-
 nsis-2.43-rpm-opt.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-nsis.spec b/mingw32-nsis.spec
index 678b01e..899b856 100644
--- a/mingw32-nsis.spec
+++ b/mingw32-nsis.spec
@@ -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 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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 @@ assembler code.
 
 %patch0 -p1 -b .64bit
 %patch1 -p1 -b .debug
+%patch2 -p1 -b .rpmopt
 
 
 %build
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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.
diff --git a/nsis-2.43-rpm-opt.patch b/nsis-2.43-rpm-opt.patch
new file mode 100644
index 0000000..27b1115
--- /dev/null
+++ b/nsis-2.43-rpm-opt.patch
@@ -0,0 +1,29 @@
+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
+