| Message ID | 20210726155235.2249878-4-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | build windows installers in ci | expand |
Hi On Mon, Jul 26, 2021 at 7:56 PM Gerd Hoffmann <kraxel@redhat.com> wrote: > This is what I find on my Fedora 34 mingw install. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > qga/installer/qemu-ga.wxs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs > index 9cb4c3d73302..ce7b25b5e16f 100644 > --- a/qga/installer/qemu-ga.wxs > +++ b/qga/installer/qemu-ga.wxs > @@ -31,7 +31,7 @@ > <?endif?> > > <?if $(var.Arch) = "32"?> > - <?define ArchLib=libgcc_s_sjlj-1.dll?> > + <?define ArchLib=libgcc_s_dw2-1.dll?> > <?define GaProgramFilesFolder="ProgramFilesFolder" ?> > <?endif?> > > msitools/wixl has Fedora WXI (wxs includes files) for that https://gitlab.gnome.org/GNOME/msitools/-/blob/master/data/wixl/gcc.wxi In theory, all you need is: "<?require $DEP.wxi?>" at the top level, and reference the component group "<ComponentGroupRef Id="CG.$DEP"/>" That's how we handle the dozens for dependencies in virt-viewer/spice.
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 9cb4c3d73302..ce7b25b5e16f 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -31,7 +31,7 @@ <?endif?> <?if $(var.Arch) = "32"?> - <?define ArchLib=libgcc_s_sjlj-1.dll?> + <?define ArchLib=libgcc_s_dw2-1.dll?> <?define GaProgramFilesFolder="ProgramFilesFolder" ?> <?endif?>
This is what I find on my Fedora 34 mingw install. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- qga/installer/qemu-ga.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)