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: 27-Jun-2009 14:53:28
Branch: HEAD Handle: 2009062713532800
Modified files:
openpkg-src/nsis nsis.patch nsis.spec
Log:
more 32 bit specifics removals
Summary:
Revision Changes Path
1.5 +16 -4 openpkg-src/nsis/nsis.patch
1.9 +1 -1 openpkg-src/nsis/nsis.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nsis/nsis.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 nsis.patch
--- openpkg-src/nsis/nsis.patch 26 Jun 2009 18:25:39 -0000 1.4
+++ openpkg-src/nsis/nsis.patch 27 Jun 2009 12:53:28 -0000 1.5
@@ -1,6 +1,6 @@
Index: SCons/Config/gnu
--- SCons/Config/gnu.orig 2009-02-05 01:52:28 +0100
-+++ SCons/Config/gnu 2009-06-26 20:15:19 +0200
++++ SCons/Config/gnu 2009-06-27 14:02:32 +0200
@@ -1,5 +1,7 @@
print "Using GNU tools configuration"
@@ -26,15 +26,27 @@
conf.CheckLinkFlag('$MAP_FLAG') # generate map file
if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
TestStrip(conf) # strip
-@@ -148,6 +149,8 @@
+@@ -148,9 +149,9 @@
### 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')
+-conf.CheckCompileFlag('-m32')
+-conf.CheckLinkFlag('-m32')
+ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
+ TestStrip(conf) # strip
+ conf.Finish()
+@@ -160,8 +161,6 @@
+ test_env = defenv.Clone()
+ test_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
+ conf = FlagsConfigure(test_env)
+-conf.CheckCompileFlag('-m32')
+-conf.CheckLinkFlag('-m32')
+ conf.Finish()
+
+ ### weird GCC requirements
Index: nsis-2.45/Contrib/Modern UI 2/Deprecated.nsh
--- nsis-2.45/Contrib/Modern UI 2/Deprecated.nsh.orig 2007-12-22
12:13:28 +0100
+++ nsis-2.45/Contrib/Modern UI 2/Deprecated.nsh 2009-06-26 20:20:56
+0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsis/nsis.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 nsis.spec
--- openpkg-src/nsis/nsis.spec 26 Jun 2009 18:25:39 -0000 1.8
+++ openpkg-src/nsis/nsis.spec 27 Jun 2009 12:53:28 -0000 1.9
@@ -32,7 +32,7 @@
Group: System
License: GPL
Version: 2.45
-Release: 20090626
+Release: 20090627
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/nsis/nsis-%{version}-src.tar.bz2
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
