[mingw-nsis: 7/27] Fix rpm-opt patch (hopefully).

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:04:53 UTC 2012


commit 217e0d1da92cebbd249b2eb9e181e3d18d61f32a
Author: Kevin Kofler <kkofler at fedoraproject.org>
Date:   Wed Feb 25 12:51:58 2009 +0000

    Fix rpm-opt patch (hopefully).

 nsis-2.43-rpm-opt.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/nsis-2.43-rpm-opt.patch b/nsis-2.43-rpm-opt.patch
index 27b1115..9245e31 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 08:50:15.000000000 +0100
++++ nsis-2.43-src-rpm-opt/SCons/Config/gnu	2009-02-25 13:45:40.000000000 +0100
 @@ -1,5 +1,7 @@
  print "Using GNU tools configuration"
  
@@ -14,7 +14,7 @@ diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/S
  	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(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
@@ -23,7 +23,7 @@ diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/S
  	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 = 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
  


More information about the scm-commits mailing list