OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 22-Mar-2009 10:50:15 Branch: HEAD Handle: 2009032209501500 Added files: openpkg-src/nsis nsis.patch Log: put missing patch into CVS control Summary: Revision Changes Path 1.1 +30 -0 openpkg-src/nsis/nsis.patch ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/nsis/nsis.patch ============================================================================ $ cvs diff -u -r0 -r1.1 nsis.patch --- /dev/null 2009-03-22 10:50:13 +0100 +++ nsis.patch 2009-03-22 10:50:15 +0100 @@ -0,0 +1,30 @@ +Index: SCons/Config/gnu +--- SCons/Config/gnu.orig 2009-02-05 01:52:28 +0100 ++++ SCons/Config/gnu 2009-03-22 00:33:53 +0100 +@@ -1,5 +1,7 @@ + print "Using GNU tools configuration" + ++import os ++ + Import('defenv') + + ### imports +@@ -89,7 +91,8 @@ + makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG']) + + if not defenv['DEBUG']: +- makensis_env.Append(CCFLAGS = ['-O2']) # optimize ++ makensis_env.Append(CCFLAGS = os.getenv('OPENPKG_CCFLAGS')) ++ makensis_env.Append(LINKFLAGS = os.getenv('OPENPKG_LINKFLAGS')) + 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 +@@ -148,6 +151,8 @@ + + ### cross-platform util environment adjustments + ++cp_util_env.Append(CCFLAGS = os.getenv('OPENPKG_CCFLAGS')) ++cp_util_env.Append(LINKFLAGS = os.getenv('OPENPKG_LINKFLAGS')) + conf = FlagsConfigure(cp_util_env) + conf.CheckCompileFlag('-m32') + conf.CheckLinkFlag('-m32') @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org