From 4091636ef3bed2098731fed25f66d65c3a77a294 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 7 Sep 2023 11:03:28 +0200 Subject: [PATCH] guix: remove GCC 10 workaround from NSIS Based on Bitcoin PR #28370 --- contrib/guix/manifest.scm | 7 +----- .../guix/patches/nsis-gcc-10-memmove.patch | 23 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 contrib/guix/patches/nsis-gcc-10-memmove.patch diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 97c8738..ca9cc43 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -178,11 +178,6 @@ chain for " target " development.")) (home-page (package-home-page pthreads-xgcc)) (license (package-license pthreads-xgcc))))) -(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"))) - (define-public mingw-w64-base-gcc (package (inherit base-gcc) @@ -348,7 +343,7 @@ chain for " target " development.")) (cond ((string-suffix? "-mingw32" target) ;; Windows (list (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") - (make-nsis-for-gcc-10 nsis-x86_64))) + nsis-x86_64)) ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") diff --git a/contrib/guix/patches/nsis-gcc-10-memmove.patch b/contrib/guix/patches/nsis-gcc-10-memmove.patch deleted file mode 100644 index a1aadfd..0000000 --- a/contrib/guix/patches/nsis-gcc-10-memmove.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit f6df41524e703dc471e283e566a48e05a735b7f2 -Author: Anders -Date: Sat Jun 27 23:18:45 2020 +0000 - - Don't let GCC 10 generate memmove calls (bug #1248) - - git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7189 212acab6-be3b-0410-9dea-997c60f758d6 - -diff --git a/SCons/Config/gnu b/SCons/Config/gnu -index bfcb362d..21fa446b 100644 ---- a/SCons/Config/gnu -+++ b/SCons/Config/gnu -@@ -103,6 +103,10 @@ 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 - -+conf = FlagsConfigure(stub_env) -+conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248) -+conf.Finish() -+ - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -