From ee945e705891cc0a5abaf8dd8174caf7cc90fb21 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Fri, 30 Jul 2021 12:28:06 -0700
Subject: [PATCH] Adding -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT for deadsnakes.

---
 .github/workflows/ci_sh_def.yml       |  1 +
 .github/workflows/ci_sh_def.yml.patch | 34 +++++++++++++++++----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml
index 6d35cade3..09bd9a914 100644
--- a/.github/workflows/ci_sh_def.yml
+++ b/.github/workflows/ci_sh_def.yml
@@ -247,6 +247,7 @@ jobs:
         -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
         -DCMAKE_CXX_STANDARD=17
+        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
 
     - name: Build
       run: cmake --build build -j 2
diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch
index 87c71c9c0..cf3520d96 100644
--- a/.github/workflows/ci_sh_def.yml.patch
+++ b/.github/workflows/ci_sh_def.yml.patch
@@ -1,5 +1,5 @@
 --- ci.yml	2021-07-30 11:29:33.606510028 -0700
-+++ ci_sh_def.yml	2021-07-30 11:36:51.284724775 -0700
++++ ci_sh_def.yml	2021-07-30 12:20:02.822962583 -0700
 @@ -1,4 +1,16 @@
 -name: CI-SH-AVL
 +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -34,7 +34,15 @@
          ${{ matrix.args }}
          ${{ matrix.args2 }}
  
-@@ -287,6 +301,7 @@
+@@ -233,6 +247,7 @@
+         -DDOWNLOAD_CATCH=ON
+         -DDOWNLOAD_EIGEN=ON
+         -DCMAKE_CXX_STANDARD=17
++        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
+ 
+     - name: Build
+       run: cmake --build build -j 2
+@@ -287,6 +302,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@@ -42,7 +50,7 @@
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
      - name: Build
-@@ -316,7 +331,8 @@
+@@ -316,7 +332,8 @@
        run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
  
      - name: Configure
@@ -52,7 +60,7 @@
  
      - name: Build
        run: cmake --build build -j2 --verbose
-@@ -396,7 +412,7 @@
+@@ -396,7 +413,7 @@
          cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
                              -DCMAKE_CXX_STANDARD=11 \
                              -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -61,7 +69,7 @@
                              -DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
  
      # Building before installing Pip should produce a warning but not an error
-@@ -455,6 +471,7 @@
+@@ -455,6 +472,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@@ -69,7 +77,7 @@
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
      - name: Build
-@@ -510,6 +527,7 @@
+@@ -510,6 +528,7 @@
          -DDOWNLOAD_CATCH=ON     \
          -DDOWNLOAD_EIGEN=OFF    \
          -DCMAKE_CXX_STANDARD=11             \
@@ -77,7 +85,7 @@
          -DCMAKE_CXX_COMPILER=$(which icpc)  \
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
-@@ -542,6 +560,7 @@
+@@ -542,6 +561,7 @@
          -DDOWNLOAD_CATCH=ON     \
          -DDOWNLOAD_EIGEN=OFF    \
          -DCMAKE_CXX_STANDARD=17             \
@@ -85,7 +93,7 @@
          -DCMAKE_CXX_COMPILER=$(which icpc)  \
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
-@@ -612,6 +631,7 @@
+@@ -612,6 +632,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=11
@@ -93,7 +101,7 @@
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
      - name: Build
-@@ -662,6 +682,7 @@
+@@ -662,6 +683,7 @@
          cmake ../pybind11-tests
          -DDOWNLOAD_CATCH=ON
          -DPYBIND11_WERROR=ON
@@ -101,7 +109,7 @@
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
        working-directory: /build-tests
  
-@@ -757,6 +778,7 @@
+@@ -757,6 +779,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
@@ -109,7 +117,7 @@
          ${{ matrix.args }}
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -803,6 +825,7 @@
+@@ -803,6 +826,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
@@ -117,7 +125,7 @@
  
      - name: Build C++14
        run: cmake --build build -j 2
-@@ -823,12 +846,13 @@
+@@ -823,12 +847,13 @@
            - 3.7
          std:
            - 14
@@ -132,7 +140,7 @@
  
      steps:
      - uses: actions/checkout@v2
-@@ -884,7 +908,7 @@
+@@ -884,7 +909,7 @@
      - name: Configure
        # LTO leads to many undefined reference like
        # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)