diff options
| -rw-r--r-- | manual tests/2 multiwrap/subprojects/libpng.wrap | 14 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/manual tests/2 multiwrap/subprojects/libpng.wrap b/manual tests/2 multiwrap/subprojects/libpng.wrap index fb34a89..283775c 100644 --- a/manual tests/2 multiwrap/subprojects/libpng.wrap +++ b/manual tests/2 multiwrap/subprojects/libpng.wrap @@ -1,10 +1,10 @@ [wrap-file] -directory = libpng-1.6.17 +directory = libpng-1.6.34 -source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng16/libpng-1.6.17.tar.xz -source_filename = libpng-1.6.17.tar.xz -source_hash = 98507b55fbe5cd43c51981f2924e4671fd81fe35d52dc53357e20f2c77fa5dfd +source_url = ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-1.6.34.tar.xz +source_filename = libpng-1.6.34.tar.xz +source_hash = 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.17/6/get_zip -patch_filename = libpng-1.6.17-6-wrap.zip -patch_hash = 8bd272e28e6ae84691935e84bca9f5eb02632221e6faccf427eb71bf745a7295 +patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.34/1/get_zip +patch_filename = libpng-1.6.34-1-wrap.zip +patch_hash = 2123806eba8180c164e33a210f2892bbeb2473b69e56aecc786574e9221e6f20 diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index cbb3e5e..d423832 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -252,6 +252,8 @@ int dummy; # Get all generated headers. Any source file might need them so # we need to add an order dependency to them. def get_generated_headers(self, target): + if hasattr(target, 'cached_generated_headers'): + return target.cached_generated_headers header_deps = [] # XXX: Why don't we add deps to CustomTarget headers here? for genlist in target.get_generated_sources(): @@ -267,6 +269,7 @@ int dummy; for dep in itertools.chain(target.link_targets, target.link_whole_targets): if isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): header_deps += self.get_generated_headers(dep) + target.cached_generated_headers = header_deps return header_deps def get_target_generated_sources(self, target): diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 1230e3f..91c9a16 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -329,7 +329,7 @@ class CCompiler(Compiler): def _build_wrapper(self, code, env, extra_args, dependencies=None, mode='compile', want_output=False): args = self._get_compiler_check_args(env, extra_args, dependencies, mode) - return self.compile(code, args.to_native(), mode, want_output=want_output) + return self.compile(code, args, mode, want_output=want_output) def links(self, code, env, extra_args=None, dependencies=None): return self.compiles(code, env, extra_args, dependencies, mode='link') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 5455118..6d67472 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -869,7 +869,7 @@ This will become a hard error in the future.''') return [] @permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default', - 'annotations', 'docbook', 'install', 'install_header'}) + 'annotations', 'docbook', 'install_header', 'install_dir'}) def gdbus_codegen(self, state, args, kwargs): if len(args) != 2: raise MesonException('Gdbus_codegen takes two arguments, name and xml file.') |