From aa288d55e1b6191c517a928f14631d67dca213bc Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 21:00:37 +0200 Subject: [PATCH 1/3] [3.9] CI: Bump macOS build to use OpenSSL v3.0 (GH-105538) (cherry picked from commit 34e93d3998bab8acd651c50724eb1977f4860a08) Co-authored-by: Erlend E. Aasland --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab2d0e4fd1e4b8..6720f1e12a1afb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,15 +153,14 @@ jobs: PYTHONSTRICTEXTENSIONBUILD: 1 steps: - uses: actions/checkout@v3 + - name: Install Homebrew dependencies + run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk - name: Configure CPython run: | - brew install pkg-config openssl@1.1 xz gdbm tcl-tk - CC=clang \ CPPFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \ LDFLAGS="-L$(brew --prefix gdbm)/lib -L$(brew --prefix xz)/lib" \ - ./configure --prefix=/opt/python-dev \ - --with-pydebug \ - --with-openssl="$(brew --prefix openssl@1.1)" \ + ./configure --with-pydebug \ + --with-openssl="$(brew --prefix openssl@3.0)" \ --with-tcltk-libs="$(pkg-config --libs tk)" \ --with-tcltk-includes="$(pkg-config --cflags tk)" - name: Build CPython From 05e35bedef6929e50ed165e6d3a94304e2b5bbfe Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 21:20:08 +0200 Subject: [PATCH 2/3] Add back CC=clang hack --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6720f1e12a1afb..cfd0c5cd27b471 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,6 +157,7 @@ jobs: run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk - name: Configure CPython run: | + CC=clang \ CPPFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \ LDFLAGS="-L$(brew --prefix gdbm)/lib -L$(brew --prefix xz)/lib" \ ./configure --with-pydebug \ From 46cb7528f74297e773ef2d18174c7fce7481fc31 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 21:21:24 +0200 Subject: [PATCH 3/3] Add back --prefix --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfd0c5cd27b471..37fd2ee863f725 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,8 @@ jobs: CC=clang \ CPPFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \ LDFLAGS="-L$(brew --prefix gdbm)/lib -L$(brew --prefix xz)/lib" \ - ./configure --with-pydebug \ + ./configure --prefix=/opt/python-dev \ + --with-pydebug \ --with-openssl="$(brew --prefix openssl@3.0)" \ --with-tcltk-libs="$(pkg-config --libs tk)" \ --with-tcltk-includes="$(pkg-config --cflags tk)"