From 2633c0289968c094b52ad8fa665e6858238f6d0b Mon Sep 17 00:00:00 2001
From: David Lakin <github@themoderndev.com>
Date: Tue, 4 Jun 2024 09:51:18 -0400
Subject: [PATCH] [pybind11] Update Include Paths to Use Base Builder Python
 3.10

Updates hardocded references to Python 3.8 installation paths
to point to the Python 3.10 equivalents instead.
---
 projects/pybind11/Dockerfile | 3 +--
 projects/pybind11/build.sh   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/projects/pybind11/Dockerfile b/projects/pybind11/Dockerfile
index f2fa2091d1ad..9011e8bf2c81 100644
--- a/projects/pybind11/Dockerfile
+++ b/projects/pybind11/Dockerfile
@@ -16,8 +16,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 
 RUN apt-get update && \
-    apt-get install -y python-is-python3 build-essential pip python3-dev
-RUN python3 -m pip install --upgrade pip
+    apt-get install -y build-essential
 
 RUN git clone https://github.com/pybind/pybind11
 COPY build.sh *_fuzzer.cc $SRC/
diff --git a/projects/pybind11/build.sh b/projects/pybind11/build.sh
index 75fef7b06ede..b2eaffe6fed9 100755
--- a/projects/pybind11/build.sh
+++ b/projects/pybind11/build.sh
@@ -20,13 +20,13 @@ cmake -S . -B build -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON
 cmake --build build -j4
 python3 -m pip install .
 
-cp /usr/local/lib/libpython3.8.so.1.0 $OUT/
+cp /usr/local/lib/libpython3.10.so.1.0 $OUT/
 for f in $SRC/*_fuzzer.cc; do
   fuzzer=$(basename "$f" _fuzzer.cc)
   $CXX $CXXFLAGS \
-    -I$SRC/pybind11/include -isystem /usr/local/include/python3.8 \
+    -I$SRC/pybind11/include -isystem /usr/local/include/python3.10 \
     $SRC/${fuzzer}_fuzzer.cc -o $OUT/${fuzzer}_fuzzer \
-    /usr/local/lib/libpython3.8.so.1.0 \
+    /usr/local/lib/libpython3.10.so.1.0 \
     $LIB_FUZZING_ENGINE -lpthread
   patchelf --set-rpath '$ORIGIN/'  $OUT/${fuzzer}_fuzzer
 done