From 8fee96c854bb9fe31cab8bc15d5d750eb141b1e4 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Fri, 5 Jan 2024 15:28:52 -0800 Subject: [PATCH] Update libffi build branch --- pycheribuild/projects/cross/glib.py | 2 +- pycheribuild/projects/cross/wayland.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pycheribuild/projects/cross/glib.py b/pycheribuild/projects/cross/glib.py index 11e203a30..58f9fd2cf 100644 --- a/pycheribuild/projects/cross/glib.py +++ b/pycheribuild/projects/cross/glib.py @@ -39,7 +39,7 @@ def setup(self) -> None: super().setup() self.add_meson_options(tests=True) if self.compiling_for_host() and self.target_info.is_linux(): - self.add_meson_options(gtk_doc=True) + self.add_meson_options(documentation=True) self.common_warning_flags.append("-Werror=int-conversion") self.common_warning_flags.append("-Werror=incompatible-pointer-types") self.COMMON_FLAGS.append("-DG_ENABLE_EXPERIMENTAL_ABI_COMPILATION") diff --git a/pycheribuild/projects/cross/wayland.py b/pycheribuild/projects/cross/wayland.py index 9e0679f78..401492b68 100644 --- a/pycheribuild/projects/cross/wayland.py +++ b/pycheribuild/projects/cross/wayland.py @@ -177,6 +177,7 @@ class BuildDejaGNU(AutotoolsProject): class BuildLibFFI(CrossCompileAutotoolsProject): repository = GitRepository("https://github.com/libffi/libffi.git", temporary_url_override="https://github.com/CTSRD-CHERI/libffi.git", + default_branch="v3.4.4-cheriabi", force_branch=True, url_override_reason="Needs lots of CHERI fixes") target = "libffi" supported_architectures = CompilationTargets.ALL_FREEBSD_AND_CHERIBSD_TARGETS + CompilationTargets.ALL_NATIVE @@ -196,8 +197,13 @@ def run_tests(self): install_instructions=OSInfo.install_instructions("runtest", False, default="dejagnu", apt="dejagnu", homebrew="deja-gnu"), cheribuild_target="dejagnu", cheribuild_xtarget=CompilationTargets.NATIVE) + runtest_flags = "-a" + if self.config.debug_output: + runtest_flags += " -v -v -v" + elif self.config.verbose: + runtest_flags += " -v" if self.compiling_for_host(): - self.run_cmd("make", "check", "RUNTESTFLAGS=-a", cwd=self.build_dir, + self.run_cmd("make", "check", f"RUNTESTFLAGS={runtest_flags}", cwd=self.build_dir, env=dict(DEJAGNU=self.source_dir / ".ci/site.exp", BOARDSDIR=self.source_dir / ".ci")) elif self.target_info.is_cheribsd(): # We need two minor fixes for SSH execution: @@ -234,7 +240,8 @@ def run_tests(self): # Build tests statically linked so they pick up the local libffi library set TOOL_OPTIONS -static """, overwrite=True) - self.run_cmd(["make", "check", "RUNTESTFLAGS=-a --target-board remote-cheribsd --xml"], + self.run_cmd(["make", "check", + f"RUNTESTFLAGS={runtest_flags} --target-board remote-cheribsd --xml"], env=dict(BOARDSDIR=self.build_dir, DEJAGNU=self.build_dir / "site.exp"), cwd=str(self.build_dir)) else: