summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2023-05-04 00:05:39 +0300
committerTim-Philipp Müller <tim@centricular.com>2023-05-26 18:40:45 +0100
commit155ea21d2b8894957c90a685e75893fd43eb8b78 (patch)
tree0144a3b559ab97f0bf44fee06f412a86a7e153a0
parente60ead977cb6918972af2f61e016de9df691106f (diff)
glib: Ship Windows process spawning helpers
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1185>
-rw-r--r--recipes/glib.recipe12
1 files changed, 12 insertions, 0 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 4041ba4e..256683ef 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -3,6 +3,7 @@ import shlex
import shutil
from cerbero.tools.libtool import LibtoolLibrary
from cerbero.tools.libtool import get_libtool_versions
+from cerbero.utils import messages as m
GLIB_CONFIG_UNVERSAL='''\
#ifdef __i386__
@@ -130,6 +131,17 @@ class Recipe(recipe.Recipe):
if self.config.target_platform == Platform.WINDOWS:
self.library_type = LibraryType.SHARED
+ # Glib needs special process spawning helpers on Windows
+ if self.config.target_platform == Platform.WINDOWS:
+ if self.config.target_arch in [Architecture.X86_64, Architecture.ARM64]:
+ self.files_bins.append('gspawn-win64-helper')
+ self.files_bins.append('gspawn-win64-helper-console')
+ elif self.config.target_arch == Architecture.X86 or Architecture.is_arm32(self.config.target_arch):
+ self.files_bins.append('gspawn-win32-helper')
+ self.files_bins.append('gspawn-win32-helper-console')
+ else:
+ m.warning(f'Unsupported Windows architecture {self.config.target_arch}')
+
if self.config.target_platform != Platform.LINUX:
# Disable valgrind code on non-Linux, in the best case it just
# gives us compiler errors :)