adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NSIS: Include libgcc_s_sjlj-1.dll again

Browse Source 
gettext-iconv-windows v0.22.5a-v1.17 requires libgcc_s_sjlj-1.dll again.
Add a new option ${INCLUDE_LIBGCC} to control whether it should be
included in the package.

This partly reverts 49f1e1979f.

Related: https://github.com/vim/vim-win32-installer/pull/355

closes: #15819

Signed-off-by: K.Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
K.Takata
2024-10-07 20:37:00 +02:00
committed by Christian Brabandt
parent fd4e47e06b
commit 48f3833ff0
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nsis/gvim.nsi
View File

@ -53,6 +53,12 @@ Unicode true
!define WIN64 0 !define WIN64 0
!endif !endif
# if you don't want to include libgcc_s_sjlj-1.dll in the package, use the
# switch /DINCLUDE_LIBGCC=0 on the command line makensis.exe.
!ifndef INCLUDE_LIBGCC
!define INCLUDE_LIBGCC 1
!endif
!include gvim_version.nsh # for version number !include gvim_version.nsh # for version number
# Definition of Patch for Vim. # Definition of Patch for Vim.
@ -728,12 +734,14 @@ Section "$(str_section_nls)" id_section_nls
!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
"${GETTEXT}\gettext${BIT}\libiconv-2.dll" \ "${GETTEXT}\gettext${BIT}\libiconv-2.dll" \
"$0\libiconv-2.dll" "$0" "$0\libiconv-2.dll" "$0"
# Install libgcc_s_sjlj-1.dll only if it is needed. !if ${INCLUDE_LIBGCC}
# !if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" !if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll"
# !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ # Install libgcc_s_sjlj-1.dll only if it is needed.
# "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" \ !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
# "$0\libgcc_s_sjlj-1.dll" "$0" "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" \
# !endif "$0\libgcc_s_sjlj-1.dll" "$0"
!endif
!endif
${If} ${SectionIsSelected} ${id_section_editwith} ${If} ${SectionIsSelected} ${id_section_editwith}
${If} ${RunningX64} ${If} ${RunningX64}
@ -759,12 +767,14 @@ Section "$(str_section_nls)" id_section_nls
!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
"${GETTEXT}\gettext32\libiconv-2.dll" \ "${GETTEXT}\gettext32\libiconv-2.dll" \
"$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32" "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32"
# Install libgcc_s_sjlj-1.dll only if it is needed. !if ${INCLUDE_LIBGCC}
# !if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" !if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll"
# !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \ # Install libgcc_s_sjlj-1.dll only if it is needed.
# "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \ !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
# "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32" "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \
# !endif "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32"
!endif
!endif
${EndIf} ${EndIf}
SectionEnd SectionEnd
!endif !endif