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 11:15:42
Branch: HEAD Handle: 2009032210154100
Modified files:
openpkg-src/nsis nsis.patch nsis.spec
Log:
no -m32 and no stripping
Summary:
Revision Changes Path
1.2 +10 -3 openpkg-src/nsis/nsis.patch
1.4 +1 -0 openpkg-src/nsis/nsis.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nsis/nsis.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 nsis.patch
--- openpkg-src/nsis/nsis.patch 22 Mar 2009 09:50:15 -0000 1.1
+++ openpkg-src/nsis/nsis.patch 22 Mar 2009 10:15:41 -0000 1.2
@@ -1,6 +1,6 @@
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
++++ SCons/Config/gnu 2009-03-22 11:10:03 +0100
@@ -1,5 +1,7 @@
print "Using GNU tools configuration"
@@ -9,7 +9,7 @@
Import('defenv')
### imports
-@@ -89,7 +91,8 @@
+@@ -89,14 +91,13 @@
makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
if not defenv['DEBUG']:
@@ -19,7 +19,14 @@
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 @@
+
+ conf = FlagsConfigure(makensis_env)
+-conf.CheckCompileFlag('-m32') #
+-conf.CheckLinkFlag('-m32') #
+ 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 @@
### cross-platform util environment adjustments
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsis/nsis.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 nsis.spec
--- openpkg-src/nsis/nsis.spec 22 Mar 2009 10:06:29 -0000 1.3
+++ openpkg-src/nsis/nsis.spec 22 Mar 2009 10:15:41 -0000 1.4
@@ -79,6 +79,7 @@
SKIPPLUGINS=all \
SKIPUTILS=all \
SKIPMISC=all \
+ STRIP=no \
makensis
%install
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
