diff options
| author | fanquake <fanquake@gmail.com> | 2023-08-22 16:04:18 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-08-24 09:21:49 +0100 |
| commit | a1d4a42993b032cb74734d2d728f9baf98673c9e (patch) | |
| tree | 1a582e33778887536ebb23e7376338cc67d57de9 /contrib | |
| parent | 1f6c75e82bc97ff08e444f2b0569289e96a42356 (diff) | |
| download | bitcoin-a1d4a42993b032cb74734d2d728f9baf98673c9e.tar.xz | |
guix: drop NSIS patch now that we use 3.09
See https://sourceforge.net/p/nsis/bugs/1283/.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/guix/manifest.scm | 3 | ||||
| -rw-r--r-- | contrib/guix/patches/nsis-disable-installer-reloc.patch | 30 |
2 files changed, 1 insertions, 32 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 94ed31ff6d..f7d8cdb6ca 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -145,8 +145,7 @@ chain for " target " development.")) (define (make-nsis-for-gcc-10 base-nsis) (package-with-extra-patches base-nsis - (search-our-patches "nsis-gcc-10-memmove.patch" - "nsis-disable-installer-reloc.patch"))) + (search-our-patches "nsis-gcc-10-memmove.patch"))) ;; While LIEF is packaged in Guix, we maintain our own package, ;; to simplify building, and more easily apply updates. diff --git a/contrib/guix/patches/nsis-disable-installer-reloc.patch b/contrib/guix/patches/nsis-disable-installer-reloc.patch deleted file mode 100644 index 4914527e56..0000000000 --- a/contrib/guix/patches/nsis-disable-installer-reloc.patch +++ /dev/null @@ -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) |