From b2929ac16dd3be0f8d902be88beed72b986f28e2 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2024 14:34:45 +0100
Subject: [PATCH 1/4] Also build static nghttp2 lib

---
 .github/workflows/nghttp2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nghttp2.yml b/.github/workflows/nghttp2.yml
index 3a067a3..b17fafc 100644
--- a/.github/workflows/nghttp2.yml
+++ b/.github/workflows/nghttp2.yml
@@ -32,7 +32,7 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure nghttp2
-        run: cd nghttp2 && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} .
+        run: cd nghttp2 && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DBUILD_STATIC_LIBS=ON .
       - name: Build nghttp2
         run: cd nghttp2 && cmake --build . --config RelWithDebInfo --target nghttp2
       - name: Install nghttp2

From fc0663cc7610c3a31e2a462ad884ae19800ec528 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2024 14:58:08 +0100
Subject: [PATCH 2/4] ENABLE_LIB_ONLY instead of building only the nghttp2
 target

This configuration option is available as of nghttp2 1.9.0, so there
shouldmn't be issues if we would need to rebuild on old version.
---
 .github/workflows/nghttp2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nghttp2.yml b/.github/workflows/nghttp2.yml
index b17fafc..64cd19e 100644
--- a/.github/workflows/nghttp2.yml
+++ b/.github/workflows/nghttp2.yml
@@ -32,9 +32,9 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure nghttp2
-        run: cd nghttp2 && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DBUILD_STATIC_LIBS=ON .
+        run: cd nghttp2 && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DENABLE_LIB_ONLY=ON -DBUILD_STATIC_LIBS=ON .
       - name: Build nghttp2
-        run: cd nghttp2 && cmake --build . --config RelWithDebInfo --target nghttp2
+        run: cd nghttp2 && cmake --build . --config RelWithDebInfo
       - name: Install nghttp2
         run: |
           cd nghttp2

From 78904e27c63d747c9f6e19e8ec5fd7cc3a679e75 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2024 15:00:58 +0100
Subject: [PATCH 3/4] Also install PDB of static lib

---
 .github/workflows/nghttp2.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/nghttp2.yml b/.github/workflows/nghttp2.yml
index 64cd19e..b2c071e 100644
--- a/.github/workflows/nghttp2.yml
+++ b/.github/workflows/nghttp2.yml
@@ -40,6 +40,7 @@ jobs:
           cd nghttp2
           cmake --install . --config RelWithDebInfo --prefix ..\winlib-builder\build
           copy lib\RelWithDebInfo\nghttp2.pdb ..\winlib-builder\build\bin
+          copy lib\RelWithDebInfo\nghttp2_static.pdb ..\winlib-builder\builder\lib
           del /s /q ..\winlib-builder\build\lib\pkgconfig\*
           del /s /q ..\winlib-builder\build\share\*
       - name: Upload artifacts

From 4adb77fa4451d12260324b71bd84dc0762241c6f Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2024 15:09:24 +0100
Subject: [PATCH 4/4] Fix path

---
 .github/workflows/nghttp2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nghttp2.yml b/.github/workflows/nghttp2.yml
index b2c071e..a620118 100644
--- a/.github/workflows/nghttp2.yml
+++ b/.github/workflows/nghttp2.yml
@@ -40,7 +40,7 @@ jobs:
           cd nghttp2
           cmake --install . --config RelWithDebInfo --prefix ..\winlib-builder\build
           copy lib\RelWithDebInfo\nghttp2.pdb ..\winlib-builder\build\bin
-          copy lib\RelWithDebInfo\nghttp2_static.pdb ..\winlib-builder\builder\lib
+          copy lib\RelWithDebInfo\nghttp2_static.pdb ..\winlib-builder\build\lib
           del /s /q ..\winlib-builder\build\lib\pkgconfig\*
           del /s /q ..\winlib-builder\build\share\*
       - name: Upload artifacts