[msitools: 1/2] data: add GCC dep to bzip2, expat, gsm, libepoxy, portablexdr, zlib
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 1/2] data: add GCC dep to bzip2, expat, gsm, libepoxy, portablexdr, zlib
- Date: Tue, 2 Feb 2021 16:17:34 +0000 (UTC)
commit 8256b66b37878faef4c63465f04544becd7e1f0f
Author: Daniel P. Berrangé <berrange redhat com>
Date: Mon Feb 1 18:45:28 2021 +0000
data: add GCC dep to bzip2, expat, gsm, libepoxy, portablexdr, zlib
These packages all now reference libgcc_s_dw2-1.dll
Signed-off-by: Daniel P. Berrangé <berrange redhat com>
data/wixl/bzip2.wxi | 2 ++
data/wixl/expat.wxi | 2 ++
data/wixl/gsm.wxi | 2 ++
data/wixl/libepoxy.wxi | 2 ++
data/wixl/portablexdr.wxi | 2 ++
data/wixl/zlib.wxi | 2 ++
6 files changed, 12 insertions(+)
---
diff --git a/data/wixl/bzip2.wxi b/data/wixl/bzip2.wxi
index 296996c..f4c889a 100644
--- a/data/wixl/bzip2.wxi
+++ b/data/wixl/bzip2.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.bzip2">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp883CA6FC909A0EC8BA007E2598B955E7"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/expat.wxi b/data/wixl/expat.wxi
index 5e1d421..aa65246 100644
--- a/data/wixl/expat.wxi
+++ b/data/wixl/expat.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -14,6 +15,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.expat">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmpECF4DCF9E316F40BE05A6ECE097294D0"/>
<ComponentRef Id="cmpD304D59E4EC3E4A3D6C510513A7E0A0D"/>
</ComponentGroup>
diff --git a/data/wixl/gsm.wxi b/data/wixl/gsm.wxi
index 088a773..b091709 100644
--- a/data/wixl/gsm.wxi
+++ b/data/wixl/gsm.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.gsm">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp4740BB124A6ED380751E14D3248658AB"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/libepoxy.wxi b/data/wixl/libepoxy.wxi
index afa05fa..b9e2831 100644
--- a/data/wixl/libepoxy.wxi
+++ b/data/wixl/libepoxy.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.libepoxy">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp6807DA99D2CA4CEF9F12AB8FE95452AF"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/portablexdr.wxi b/data/wixl/portablexdr.wxi
index b644997..f22706a 100644
--- a/data/wixl/portablexdr.wxi
+++ b/data/wixl/portablexdr.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.portablexdr">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp71C30D312561CF1E41637E013EB57148"/>
</ComponentGroup>
</Fragment>
diff --git a/data/wixl/zlib.wxi b/data/wixl/zlib.wxi
index db7212e..6e82155 100644
--- a/data/wixl/zlib.wxi
+++ b/data/wixl/zlib.wxi
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
@@ -11,6 +12,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="CG.zlib">
+ <ComponentGroupRef Id="CG.gcc"/>
<ComponentRef Id="cmp756537FE3C108611BF8CD08AED61D290"/>
</ComponentGroup>
</Fragment>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]