diff options
| author | L. E. Segovia <amy@centricular.com> | 2026-06-25 23:05:04 -0300 |
|---|---|---|
| committer | L. E. Segovia <amy@centricular.com> | 2026-06-27 01:11:58 +0000 |
| commit | d11becd7c994b65b9282e4b1fe747195e7888807 (patch) | |
| tree | 2240b3e12207311b2b37314e881d6fe447aae890 | |
| parent | 4537733fce2235faba6d458b13b371de667881ed (diff) | |
recipes: fix platform detection inconsistencies when cross building
From Windows to Android, the latter does not unset the visualstudio variant.
From macOS to Android, the latter does not unset the target subsystem.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/2254>
| -rw-r--r-- | recipes/gst-plugins-rs.recipe | 3 | ||||
| -rw-r--r-- | recipes/librsvg.recipe | 3 | ||||
| -rw-r--r-- | recipes/openssl.recipe | 2 | ||||
| -rw-r--r-- | recipes/rice-proto.recipe | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/recipes/gst-plugins-rs.recipe b/recipes/gst-plugins-rs.recipe index 5fa60209..07581415 100644 --- a/recipes/gst-plugins-rs.recipe +++ b/recipes/gst-plugins-rs.recipe @@ -456,7 +456,8 @@ class Recipe(recipe.Recipe): src = Path(self.config.prefix, f) bak = src.with_suffix('.bak') bak.unlink(missing_ok=True) - elif self.config.target_subsystem == Subsystem.MACOS: + elif self.config.target_platform == Platform.DARWIN and \ + self.config.target_subsystem == Subsystem.MACOS: libraries = [f for f in self.devel_files_list(only_existing=False) if f.endswith('.a')] prelinker = Prelink(self.config, self.env, self.logfile) diff --git a/recipes/librsvg.recipe b/recipes/librsvg.recipe index 0349f415..8788a360 100644 --- a/recipes/librsvg.recipe +++ b/recipes/librsvg.recipe @@ -117,7 +117,8 @@ class Recipe(recipe.Recipe): # removing the bitcode from the static library libraries = [f for f in self.devel_files_list(only_existing=False) if f.endswith('.a')] - if self.config.target_subsystem == Subsystem.MACOS: + if self.config.target_platform == Platform.DARWIN and \ + self.config.target_subsystem == Subsystem.MACOS: prelinker = Prelink(self.config, self.env, self.logfile) for f in libraries: prelinker.prelink(f, '_rsvg*') diff --git a/recipes/openssl.recipe b/recipes/openssl.recipe index d194a6f0..69536a2e 100644 --- a/recipes/openssl.recipe +++ b/recipes/openssl.recipe @@ -108,7 +108,7 @@ class Recipe(recipe.Recipe): cflags = srcdir_include + self.get_env('CFLAGS') ldflags = self.get_env('LDFLAGS') - if self.using_msvc(): + if self.config.target_platform == Platform.WINDOWS and self.config.variants.visualstudio: # Gets converted to C:/MinGW/msys/1.0/utf-8 by MSYS somehow, so # just remove it. We only need this for gstreamer sources anyway. cflags = cflags.replace('/utf-8', '') diff --git a/recipes/rice-proto.recipe b/recipes/rice-proto.recipe index 8882b0b9..ddc87881 100644 --- a/recipes/rice-proto.recipe +++ b/recipes/rice-proto.recipe @@ -65,7 +65,8 @@ class Recipe(recipe.Recipe): libdir = Path(self.config.prefix) / self.config.rel_libdir os.replace(libdir / 'rice-proto.lib', libdir / 'librice-proto.a') os.replace(libdir / 'rice-proto.dll.lib', libdir / 'rice-proto.lib') - elif self.config.target_subsystem == Subsystem.MACOS: + elif self.config.target_platform == Platform.DARWIN and \ + self.config.target_subsystem == Subsystem.MACOS: libraries = [f for f in self.devel_files_list(only_existing=False) if f.endswith('.a')] prelinker = Prelink(self.config, self.env, self.logfile) |