From 8b85b30cbe39ba6bb7d8f175d9a637c8ef650d26 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 21:00:37 +0200 Subject: [PATCH 1/2] [3.8] 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8102541bc3354d..2c3f0362804e2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,16 +132,16 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 steps: - uses: actions/checkout@v2 + - 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 SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk \ 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 d59b2f7898e73defbee680584827db7cc37b2d0d Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 16 Jun 2023 21:22:23 +0200 Subject: [PATCH 2/2] 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 2c3f0362804e2c..b7bc77181515be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,7 +140,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)"