From 494db1da4ae2c6b011f66808705a7852bcdd590a Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 8 Dec 2023 11:28:28 -0800 Subject: [PATCH] remove stdint include from iproute2 builder Summary: As titled, remove stdint include from iproute2 patch from iproute2 builder. Also this include is no longer neccessary as 4.12 tc_core.c contains stdint already. Code pointer for stdint: https://github.com/iproute2/iproute2/blob/v4.12.0/tc/tc_core.c#L15 Reviewed By: shri-khare Differential Revision: D51971637 fbshipit-source-id: b9b7a2a1fe24fc93b04c932b3fe4ae6080aeab08 --- build/fbcode_builder/getdeps/builder.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 3bcadb5d6..e85b11072 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -364,27 +364,12 @@ class Iproute2Builder(BuilderBase): build_opts, ctx, manifest, src_dir, build_dir, inst_dir ) - def _patch(self) -> None: - # FBOSS build currently depends on an old version of iproute2 (commit - # 7ca63aef7d1b0c808da0040c6b366ef7a61f38c1). This is missing a commit - # (ae717baf15fb4d30749ada3948d9445892bac239) needed to build iproute2 - # successfully. Apply it viz.: include stdint.h - # Reference: https://fburl.com/ilx9g5xm - with open(self.build_dir + "/tc/tc_core.c", "r") as f: - data = f.read() - - with open(self.build_dir + "/tc/tc_core.c", "w") as f: - f.write("#include \n") - f.write(data) - def _build(self, install_dirs, reconfigure) -> None: configure_path = os.path.join(self.src_dir, "configure") - env = self.env.copy() self._run_cmd([configure_path], env=env) shutil.rmtree(self.build_dir) shutil.copytree(self.src_dir, self.build_dir) - self._patch() self._run_cmd(["make", "-j%s" % self.num_jobs], env=env) install_cmd = ["make", "install", "DESTDIR=" + self.inst_dir]