Skip to content

Commit e300858

Browse files
committed
qga-win/msi: fix missing libstdc++-6 DLL in MSI installer
libstdc++ is required for the qga-vss.dll that provides fsfreeze functionality. Currently it is not provided by the MSI installer, resulting in fsfreeze being disabled in guest environments where it has not been installed by other means. In the future this would be better handled via gcc-cpp ComponentGroup provided by msitools, but that would be better handled with a general rework of DLL dependency handling in the installer build. Keep it simple for now to fix this regression. Tested with Fedora 34 mingw build environment. Cc: Gerd Hoffmann <[email protected]> Cc: Kostiantyn Kostiuk <[email protected]> Cc: Marc-André Lureau <[email protected]> Cc: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Marc-André Lureau <[email protected]> Signed-off-by: Michael Roth <[email protected]>
1 parent 5f2a8b1 commit e300858

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

qga/installer/qemu-ga.wxs

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@
8484
<ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="QEMU-GA" Wait="yes" />
8585
</Component>
8686
<?ifdef var.InstallVss?>
87+
<Component Id="libstdc++_6_lib" Guid="{55E737B5-9127-4A11-9FC3-A29367714574}">
88+
<File Id="libstdc++-6.lib" Name="libstdc++-6.dll" Source="$(var.Mingw_bin)/libstdc++-6.dll" KeyPath="yes" DiskId="1"/>
89+
</Component>
8790
<Component Id="qga_vss_dll" Guid="{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}">
8891
<File Id="qga_vss.dll" Name="qga-vss.dll" Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath="yes" DiskId="1"/>
8992
</Component>
@@ -164,6 +167,7 @@
164167
<Feature Id="QEMUFeature" Title="QEMU Guest Agent" Level="1">
165168
<ComponentRef Id="qemu_ga" />
166169
<?ifdef var.InstallVss?>
170+
<ComponentRef Id="libstdc++_6_lib" />
167171
<ComponentRef Id="qga_vss_dll" />
168172
<ComponentRef Id="qga_vss_tlb" />
169173
<?endif?>

0 commit comments

Comments
 (0)