qga-win/msi: fix missing libstdc++-6 DLL in MSI installer
PATCH 1/1 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.
--- qga/installer/qemu-ga.wxs | 4 ++++ 1 file changed, 4 insertions(+)
qga/installer/qemu-ga.wxs +4 -0
@@ -84,6 +84,9 @@ <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="QEMU-GA" Wait="yes" /> </Component> <?ifdef var.InstallVss?> + <Component Id="libstdc++_6_lib" Guid="{55E737B5-9127-4A11-9FC3-A29367714574}"> + <File Id="libstdc++-6.lib" Name="libstdc++-6.dll" Source="$(var.Mingw_bin)/libstdc++-6.dll" KeyPath="yes" DiskId="1"/> + </Component> <Component Id="qga_vss_dll" Guid="{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}"> <File Id="qga_vss.dll" Name="qga-vss.dll" Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath="yes" DiskId="1"/> </Component>
@@ -164,6 +167,7 @@ <Feature Id="QEMUFeature" Title="QEMU Guest Agent" Level="1"> <ComponentRef Id="qemu_ga" /> <?ifdef var.InstallVss?> + <ComponentRef Id="libstdc++_6_lib" /> <ComponentRef Id="qga_vss_dll" /> <ComponentRef Id="qga_vss_tlb" /> <?endif?>
Signature · 1 line
2.25.1
Quoted 10 lines · Michael Roth
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.
Quoted 8 lines
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]>Signed-off-by Michael Roth <[email protected]>
---
Quoted 35 lines
qga/installer/qemu-ga.wxs | 4 ++++ 1 file changed, 4 insertions(+)qga/installer/qemu-ga.wxs +0
-0@@ -84,6 +84,9 @@ <ServiceControl Id="StartService" Start="install" Stop="both"Remove="uninstall" Name="QEMU-GA" Wait="yes" />
</Component>
<?ifdef var.InstallVss?>
+ <Component Id="libstdc++_6_lib"
Guid="{55E737B5-9127-4A11-9FC3-A29367714574}">
+ <File Id="libstdc++-6.lib" Name="libstdc++-6.dll"
Source="$(var.Mingw_bin)/libstdc++-6.dll" KeyPath="yes" DiskId="1"/>
+ </Component>
<Component Id="qga_vss_dll"
Guid="{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}"><File Id="qga_vss.dll" Name="qga-vss.dll"Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath="yes" DiskId="1"/>
</Component>qga/installer/qemu-ga.wxs +1
-1@@ -164,6 +167,7 @@ <Feature Id="QEMUFeature" Title="QEMU Guest Agent" Level="1"> <ComponentRef Id="qemu_ga" /> <?ifdef var.InstallVss?> + <ComponentRef Id="libstdc++_6_lib" /> <ComponentRef Id="qga_vss_dll" /> <ComponentRef Id="qga_vss_tlb" /> <?endif?> --2.25.1