diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-04 15:07:58 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2014-12-15 17:36:09 +0100 |
| commit | 8dbefb1aca95a16ba586ee32c4f2753fff2d76ec (patch) | |
| tree | 7e6133572bf47ae5eb47dfa1114c9c53d63e8307 /data | |
| parent | a5b82662950447a0ed9c1d9c06269fac884602ba (diff) | |
| download | virt-viewer-8dbefb1aca95a16ba586ee32c4f2753fff2d76ec.tar.gz virt-viewer-8dbefb1aca95a16ba586ee32c4f2753fff2d76ec.tar.xz virt-viewer-8dbefb1aca95a16ba586ee32c4f2753fff2d76ec.zip | |
nsis: add libnettle-4-7.dll (and its dependencies)
libgcc_s_sjlj-1 is needed by libgmp (on x86)
libgcc_s_seh-1 is needed by libgmp (on x86_64s)
libgmp-10.dll is needed by libnettle
libhogweed-2-5.dll is provided by libnettle
libnettle-4-7.dll is needed by gnutls
gnutls is needed by gvnc and libvirt
An interesting point here that worth to mention is the usage of /nonfatal
when including libgcc_s_{sjlj,seh}-1.dll. As we only have the _seh in x64
the build breaks trying to add "not found" files. A check for arch was
one option to solve the problem, but _sjlj may exist in x64 as well, when
using an old gcc. An explicit check if the file exists (in compile time)
was another idea, but for some reason the "-" part of the filename was
interpreted as a math operand, breaking the build.
With all that in mind, adding /nonfatal was the most convenient solution.
Diffstat (limited to 'data')
| -rw-r--r-- | data/virt-viewer.nsis.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in index 51b2a4e..810ae05 100644 --- a/data/virt-viewer.nsis.in +++ b/data/virt-viewer.nsis.in @@ -142,6 +142,11 @@ Section "VirtViewer" File "@prefix@/bin/libgcrypt-20.dll" File "@prefix@/bin/libgvnc-1.0-0.dll" File "@prefix@/bin/libgtk-vnc-1.0-0.dll" + File "@prefix@/bin/libgmp-10.dll" + File "@prefix@/bin/libhogweed-2-5.dll" + File "@prefix@/bin/libnettle-4-7.dll" + File /nonfatal "@prefix@/bin/libgcc_s_sjlj-1.dll" + File /nonfatal "@prefix@/bin/libgcc_s_seh-1.dll" File "@prefix@/bin/pango-querymodules.exe" File /oname=remote-viewer.com "${DESTDIR}@prefix@/bin/windows-cmdline-wrapper.exe" @@ -302,6 +307,12 @@ Section "Uninstall" Delete /rebootok "$INSTDIR\bin\libidn-11.dll" Delete /rebootok "$INSTDIR\bin\libssh2-1.dll" Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll" + Delete /rebootok "$INSTDIR\bin\libgmp-10.dll" + Delete /rebootok "$INSTDIR\bin\libhogweed-2-5.dll" + Delete /rebootok "$INSTDIR\bin\libnettle-4-7.dll" + Delete /rebootok "$INSTDIR\bin\libgcc_s_sjlj-1.dll" + Delete /rebootok "$INSTDIR\bin\libgcc_s_seh-1.dll" + Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll" Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll" Delete /rebootok "$INSTDIR\bin\libportablexdr-0.dll" |