nsis

[Farkas Levente]

hi,
you can delete nsis-2.19-mingw-search.patch since it's no longer required.

imho these last few lines can be dropped from
nsis-2.42-debian-64bit-fixes.patch since even on x86_64 there is such
options, so is there any relevance?
--- ./SCons/Config/gnu.lfarkas  2009-01-14 16:55:33.000000000 +0100
+++ ./SCons/Config/gnu  2009-01-14 16:56:21.000000000 +0100
@@ -90,8 +90,6 @@
 makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore
virtual dtor warnings

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

[Richard W.M. Jones]

On Sun, Feb 15, 2009 at 09:06:06PM +0100, Farkas Levente wrote:
> hi,
> you can delete nsis-2.19-mingw-search.patch since it's no longer required.
>
> imho these last few lines can be dropped from
> nsis-2.42-debian-64bit-fixes.patch since even on x86_64 there is such
> options, so is there any relevance?
> --- ./SCons/Config/gnu.lfarkas  2009-01-14 16:55:33.000000000 +0100
> +++ ./SCons/Config/gnu  2009-01-14 16:56:21.000000000 +0100
> @@ -90,8 +90,6 @@
>  makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore
> virtual dtor warnings
>
> 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

It doesn't look like having these harms anything, so I'll just leave
them in there ...

Rich.

[Kevin Kofler]

Farkas Levente wrote:
> imho these last few lines can be dropped from
> nsis-2.42-debian-64bit-fixes.patch since even on x86_64 there is such
> options, so is there any relevance?

The relevance is that -m32 builds i386 stuff claiming to be x86_64 (which
does not work in Koji because the 32-bit multilibs are intentionally
excluded to prevent packages from doing that), so -m32 has to go.

I fixed NSIS to remove some more uses of -m32, now it builds fine without
ExclusiveArch nor ExcludeArch, as a true 64-bit version.

Kevin Kofler