Skip to content

Commit

Permalink
Update libffi build branch
Browse files Browse the repository at this point in the history
  • Loading branch information
arichardson committed Jan 5, 2024
1 parent baf7be1 commit 8fee96c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pycheribuild/projects/cross/glib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
11 changes: 9 additions & 2 deletions pycheribuild/projects/cross/wayland.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 8fee96c

Please sign in to comment.