Unverified Commit dc1c7038 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gkgl/bug_40052_v2'

parents 3aef0b0a 1e1d42ff

projects/nsis/build

+0 −5
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 
tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %]



cd /var/tmp/build/nsis-[% c('version') %]-src

# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it

# is used for both the host and cross-compiled parts, but this option is

# only valid for the Windows linker. Therefore we add it using a patch

# to the cross-compilation part only.

patch -p1 < $rootdir/no-insert-timestamp.patch



[% IF c("var/windows-x86_64") %]

  # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp

projects/nsis/config

+2 −3
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 3.05

version: 3.06.1

filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

var:

  container:
@@ -16,8 +16,7 @@ input_files: 
  - project: container-image

  - filename: 'nsis-[% c("version") %].tar.bz2'

    URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2'

    sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9

  - filename: no-insert-timestamp.patch

    sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0

  - name: '[% c("var/compiler") %]'

    project: '[% c("var/compiler") %]'

  - name: zlib

projects/nsis/no-insert-timestamp.patch

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu

--- nsis-3.03-src/SCons/Config/gnu	2017-10-06 15:30:20.000000000 -0400

+++ nsis-3.03-src.n/SCons/Config/gnu	2018-06-17 13:26:05.945495151 -0400

@@ -102,6 +102,7 @@

 stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG'])    # no standard libraries

 stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align

 stub_env.Append(LINKFLAGS = ['$MAP_FLAG'])          # generate map file

+stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds

 

 stub_uenv = stub_env.Clone()

 stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])

@@ -142,6 +143,7 @@

 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG'])        # generate map file

 plugin_env.Append(LINKFLAGS = ['-static-libgcc'])   # remove libgcc*.dll dependency

 plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency

+plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds

 

 plugin_uenv = plugin_env.Clone()

 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])

@@ -181,6 +183,7 @@

 

 util_env.Append(LINKFLAGS = ['-mwindows'])          # build windows executables

 util_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])        # 512 bytes align

+util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds

 

 

 conf = FlagsConfigure(util_env)