rename SystemdBuilder to MesonBuilder

Summary:
Tidy up.  Rename to MesonBuilder as builders are meant to be per orchestrated build system, not per project using them

SystemD is missing a lot of currently implicit deps but not tackling that here

Reviewed By: bigfootjon

Differential Revision: D89555877

fbshipit-source-id: c7d579310e61d09a17ef641b6c020b31cc95da8f

Author: ahornby

build/fbcode_builder/getdeps/builder.py

@@ -501,8 +501,8 @@ def _build(self, reconfigure) -> None:
         self._check_cmd(install_cmd, env=env)
 
 
-class SystemdBuilder(BuilderBase):
-    # SystemdBuilder assumes that meson build tool has already been installed on
+class MesonBuilder(BuilderBase):
+    # MesonBuilder assumes that meson build tool has already been installed on
     # the machine.
     def __init__(
         self,
@@ -515,7 +515,7 @@ def __init__(
         build_dir,
         inst_dir,
     ) -> None:
-        super(SystemdBuilder, self).__init__(
+        super(MesonBuilder, self).__init__(
             loader,
             dep_manifests,
             build_opts,
@@ -532,15 +532,18 @@ def _build(self, reconfigure) -> None:
         if meson is None:
             raise Exception("Failed to find Meson")
 
+        setup_args = self.manifest.get_section_as_args("meson.setup_args", self.ctx)
+
         # Meson builds typically require setup, compile, and install steps.
         # During this setup step we ensure that the static library is built and
         # the prefix is empty.
         self._check_cmd(
             [
                 meson,
                 "setup",
-                "-Dstatic-libsystemd=true",
-                "-Dprefix=/",
+            ]
+            + setup_args
+            + [
                 self.build_dir,
                 self.src_dir,
             ]

build/fbcode_builder/getdeps/manifest.py

@@ -18,12 +18,12 @@
     CMakeBuilder,
     Iproute2Builder,
     MakeBuilder,
+    MesonBuilder,
     NinjaBootstrap,
     NopBuilder,
     OpenSSLBuilder,
     SetupPyBuilder,
     SqliteBuilder,
-    SystemdBuilder,
 )
 from .cargo import CargoBuilder
 from .expr import parse_expr
@@ -116,6 +116,7 @@
     "make.build_args": {"optional_section": True},
     "make.install_args": {"optional_section": True},
     "make.test_args": {"optional_section": True},
+    "meson.setup_args": {"optional_section": True},
     "header-only": {"optional_section": True, "fields": {"includedir": REQUIRED}},
     "shipit.pathmap": {"optional_section": True},
     "shipit.strip": {"optional_section": True},
@@ -689,8 +690,8 @@ def create_builder(  # noqa:C901
                 inst_dir,
             )
 
-        if builder == "systemd":
-            return SystemdBuilder(
+        if builder == "meson":
+            return MesonBuilder(
                 loader,
                 dep_manifests,
                 build_options,

build/fbcode_builder/manifests/systemd

@@ -5,11 +5,15 @@ name = systemd
 systemd
 systemd-devel
 
-[download]
-url = https://github.com/systemd/systemd/archive/refs/tags/v256.7.tar.gz 
-sha256 = 896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0 
 
+[download]
+url = https://github.com/systemd/systemd/archive/refs/tags/v256.7.tar.gz
+sha256 = 896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0
 
-[build]
-builder = systemd
+[build.os=linux]
+builder = meson
 subdir = systemd-256.7
+
+[meson.setup_args]
+-Dstatic-libsystemd=true
+-Dprefix=/