highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-10-09 19:13:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix: drop NSIS patch now that we use 3.09

Browse Source 
See https://sourceforge.net/p/nsis/bugs/1283/.
This commit is contained in:
fanquake
2023-08-22 16:04:18 +01:00
parent 1f6c75e82b
commit a1d4a42993
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/guix/manifest.scm
View File

@@ -145,8 +145,7 @@ chain for " target " development."))
(define (make-nsis-for-gcc-10 base-nsis) (define (make-nsis-for-gcc-10 base-nsis)
(package-with-extra-patches base-nsis (package-with-extra-patches base-nsis
(search-our-patches "nsis-gcc-10-memmove.patch" (search-our-patches "nsis-gcc-10-memmove.patch")))
"nsis-disable-installer-reloc.patch")))
;; While LIEF is packaged in Guix, we maintain our own package, ;; While LIEF is packaged in Guix, we maintain our own package,
;; to simplify building, and more easily apply updates. ;; to simplify building, and more easily apply updates.

30
contrib/guix/patches/nsis-disable-installer-reloc.patch
View File

@@ -1,30 +0,0 @@
Patch NSIS so that it's installer stubs, produced at NSIS build time,
do not contain .reloc sections, which will exist by default when using
binutils/ld 2.36+.
This ultimately fixes an issue when running the installer with the
"Force randomization for images (Mandatory ASLR)" setting active.
This patch has not yet been sent upstream, because it's not clear if this
is the best fix, for the underlying issue, which seems to be that makensis
doesn't account for .reloc sections when it builds installers.
The existence of a reloc section shouldn't be a problem, and, if anything,
is actually a requirement for working ASLR. All other Windows binaries we
produce contain them, and function correctly when under the same
"Force randomization for images (Mandatory ASLR)" setting.
See:
https://github.com/bitcoin/bitcoin/issues/25726
https://sourceforge.net/p/nsis/bugs/1131/
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -102,6 +102,7 @@ stub_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables
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,--disable-reloc-section'])
conf = FlagsConfigure(stub_env)
conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248)