From ad79f31eb940ba02ef30a3e35ec615fec98a2be0 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Feb 25 2009 13:11:25 +0000 Subject: More fixing of rpm-opt patch: the util_env for the utilities built with MinGW is cloned from cp_util_env, so add RPM_OPT_FLAGS to cp_util_env only after that happens. --- diff --git a/nsis-2.43-rpm-opt.patch b/nsis-2.43-rpm-opt.patch index 9245e31..129d9ed 100644 --- a/nsis-2.43-rpm-opt.patch +++ b/nsis-2.43-rpm-opt.patch @@ -1,6 +1,6 @@ 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 13:45:40.000000000 +0100 ++++ nsis-2.43-src-rpm-opt/SCons/Config/gnu 2009-02-25 14:09:34.000000000 +0100 @@ -1,5 +1,7 @@ print "Using GNU tools configuration" @@ -18,12 +18,11 @@ diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/S 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 +@@ -158,6 +160,7 @@ + + ### cross-platform util environment adjustments ++cp_util_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) + conf = FlagsConfigure(cp_util_env) + if not defenv['DEBUG'] and not defenv['DEBUG_SYMBOLS'] and defenv['STRIP'] and defenv['STRIP_CP']: + TestStrip(conf) # strip