-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[vcpkg baseline][gdk-pixbuf] Fix build issues, license, cleanup (#27371)
* Minor changes * Shortcut loaders.cache generation With -Dbuiltin-loaders=all, the cache file contains nothing but comment lines. However, the generation is flaky on windows in vcpkg CI. * Revise tool fixup (fixes mingw cross builds) * Update versions
- Loading branch information
Showing
5 changed files
with
47 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | ||
index 54ff9dd..27f8512 100644 | ||
--- a/gdk-pixbuf/meson.build | ||
+++ b/gdk-pixbuf/meson.build | ||
@@ -348,7 +348,14 @@ foreach bin: gdkpixbuf_bin | ||
set_variable(bin_name.underscorify(), bin) | ||
endforeach | ||
|
||
-if not meson.is_cross_build() | ||
+if dynamic_loaders.length() == 0 | ||
+ # skip tool invocation | ||
+ cmake = find_program('cmake', required : true) | ||
+ loaders_cache = custom_target('loaders.cache', output: 'loaders.cache', capture: true, | ||
+ command: [ cmake, '-E', 'echo', '# No dynamic loaders enabled at build time' ], | ||
+ build_by_default: true) | ||
+ loaders_dep = declare_dependency(sources: [ loaders_cache ]) | ||
+elif not meson.is_cross_build() | ||
# The 'loaders.cache' used for testing, so we don't accidentally | ||
# load the installed cache; we always build it by default | ||
loaders_cache = custom_target('loaders.cache', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters