From 2ae19ffb721bba010e2b7cbf8058788367f7a3b3 Mon Sep 17 00:00:00 2001
From: Kevin Krakauer <krakauer@google.com>
Date: Wed, 13 Dec 2023 22:58:14 -0800
Subject: [PATCH] xdp: install libbpf-dev and work around arch build issue

PiperOrigin-RevId: 590826409
---
 images/default/Dockerfile |  2 +-
 tools/bazeldefs/defs.bzl  | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/images/default/Dockerfile b/images/default/Dockerfile
index d9af8639f..683028ce1 100644
--- a/images/default/Dockerfile
+++ b/images/default/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y curl gnupg2 git \
         apt-transport-https ca-certificates gnupg-agent \
         software-properties-common \
         pkg-config libffi-dev patch diffutils libssl-dev iptables kmod \
-        clang crossbuild-essential-amd64 erofs-utils busybox-static
+        clang crossbuild-essential-amd64 erofs-utils busybox-static libbpf-dev
 
 # Install Docker client for the website build.
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
diff --git a/tools/bazeldefs/defs.bzl b/tools/bazeldefs/defs.bzl
index f986029b9..0d7114c50 100644
--- a/tools/bazeldefs/defs.bzl
+++ b/tools/bazeldefs/defs.bzl
@@ -104,5 +104,21 @@ def bpf_program(name, src, bpf_object, visibility, hdrs):
         srcs = [src],
         visibility = visibility,
         outs = [bpf_object],
-        cmd = "clang -O2 -Wall -Werror -target bpf -c $< -o $@ -I/usr/include/$$(uname -m)-linux-gnu",
+        # Note: "-D __x86_64__" is a hack to deal with building across
+        # architectures. As we're targeting eBPF, setting this doesn't lead to
+        # any x86_64-specific code. But it does help with an annoying edge
+        # case:
+        #
+        # We have a single container -- images/default -- that runs on both
+        # arm64 and x86_64 machines. To build eBPF on x86_64, package
+        # gcc-multilib or libc6-dev-i386 is needed to install headers. But
+        # these don't exist on arm64, so adding it to the image breaks arm64
+        # builds.
+        #
+        # Defining __x86_64__ lets us avoid the need for these packages
+        # altogether. It turns out that the missing headers are irrelevant
+        # (unused) when building eBPF, and pretending we're targeting x86_64
+        # causes #includes to resolve without installing architecture-specific
+        # packages.
+        cmd = "clang -O2 -Wall -Werror -target bpf -c $< -o $@ -I/usr/include/$$(uname -m)-linux-gnu -D __x86_64__",
     )