Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Python PEP-0668 fallout #13476

Closed
wants to merge 25 commits into from
Closed

Python PEP-0668 fallout #13476

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a9545f7
Python PEP-0668 fallout
icing Apr 25, 2024
c5b1f40
let pip break the system packages
icing Apr 25, 2024
9c61e16
another attempt
icing Apr 25, 2024
67170e7
brew recommended gm4, but does not know gm4. try old m4
icing Apr 25, 2024
358eb06
try installing m4 before libtool
icing Apr 25, 2024
7685bbc
try setting M4 env in autoreconf run
icing Apr 25, 2024
00d3634
checkout that m4 is there and has right version
icing Apr 25, 2024
0092f38
more poking around
icing Apr 25, 2024
8bebb66
explicitly pointing to the system m4
icing Apr 25, 2024
bc7422c
xcode select the developer dir
icing Apr 25, 2024
36972e7
as root, why not?
icing Apr 25, 2024
4acf799
hmm, tricksy apple devs
icing Apr 25, 2024
969d11a
use DEVELOPER_DIR without version name
icing Apr 25, 2024
934296e
remove xcode-select again now that env is fixed, check what brew we have
icing Apr 25, 2024
25bb64b
try $BREW as path prefix
icing Apr 25, 2024
01251e5
try openssl@3 as brew install and path
icing Apr 25, 2024
74a0a85
poking around for the openssl dir
icing Apr 25, 2024
d34f573
use dockere env.BREW replacements
icing Apr 25, 2024
09bfd7b
that was not accepted
icing Apr 25, 2024
fc596c4
inspect the openssl pkgconfig content
icing Apr 25, 2024
dcdbc34
try fixing openssl's pkgconfig files
icing Apr 25, 2024
271d00e
need more permissions
icing Apr 25, 2024
8ac844a
use tmp file for redir
icing Apr 25, 2024
b318b77
disable 'gcc securetransport', give path to libssh2 build
icing Apr 25, 2024
93a3f0e
remove stray file
icing Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 33 additions & 19 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ concurrency:
permissions: {}

env:
DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
MAKEFLAGS: -j 5
BREW: /opt/homebrew

jobs:
autotools:
Expand All @@ -62,15 +63,15 @@ jobs:
macosx-version-min: 10.9
- name: libssh2
install: nghttp2 libssh2
configure: --enable-debug --with-libssh2 --without-ssl --enable-websockets
configure: --enable-debug --with-libssh2=$BREW/opt/libssh2 --without-ssl --enable-websockets
macosx-version-min: 10.9
- name: libssh-c-ares
install: openssl nghttp2 libssh
configure: --enable-debug --with-libssh --with-openssl=/usr/local/opt/openssl --enable-ares --enable-websockets
configure: --enable-debug --with-libssh --with-openssl=$BREW/opt/openssl --enable-ares --enable-websockets
macosx-version-min: 10.9
- name: libssh
install: openssl nghttp2 libssh
configure: --enable-debug --with-libssh --with-openssl=/usr/local/opt/openssl --enable-websockets
configure: --enable-debug --with-libssh --with-openssl=$BREW/opt/openssl --enable-websockets
macosx-version-min: 10.9
- name: c-ares
install: nghttp2
Expand Down Expand Up @@ -116,30 +117,31 @@ jobs:
install: nghttp2
configure: --enable-debug --with-secure-transport --enable-websockets
macosx-version-min: 10.8
- name: gcc SecureTransport
configure: CC=gcc-12 --enable-debug --with-secure-transport --enable-websockets --without-libpsl
macosx-version-min: 10.8
# Fails now with linker errors on missing symbols
# - name: gcc SecureTransport
# configure: CC=gcc-12 --enable-debug --with-secure-transport --enable-websockets --without-libpsl
# macosx-version-min: 10.8
- name: OpenSSL http2
install: nghttp2 openssl
configure: --enable-debug --with-openssl=/usr/local/opt/openssl --enable-websockets
configure: --enable-debug --with-openssl=$BREW/opt/openssl --enable-websockets
macosx-version-min: 10.9
- name: LibreSSL http2
install: nghttp2 libressl
configure: --enable-debug --with-openssl=/usr/local/opt/libressl --enable-websockets
configure: --enable-debug --with-openssl=$BREW/opt/libressl --enable-websockets
macosx-version-min: 10.9
- name: torture
install: nghttp2 openssl
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=/usr/local/opt/openssl --enable-websockets
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=$BREW/opt/openssl --enable-websockets
tflags: -n -t --shallow=25 !FTP
macosx-version-min: 10.9
- name: torture-ftp
install: nghttp2 openssl
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=/usr/local/opt/openssl --enable-websockets
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=$BREW/opt/openssl --enable-websockets
tflags: -n -t --shallow=20 FTP
macosx-version-min: 10.9
- name: macOS 10.15
install: nghttp2 libssh2 openssl
configure: --enable-debug --disable-ldap --with-openssl=/usr/local/opt/openssl --enable-websockets
configure: --enable-debug --disable-ldap --with-openssl=$BREW/opt/openssl --enable-websockets
macosx-version-min: 10.15
steps:
- run: echo libtool autoconf automake pkg-config libpsl ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
Expand All @@ -154,15 +156,27 @@ jobs:
- run: |
case "${{ matrix.build.install }}" in
*openssl*)
(
cd $BREW/opt/openssl/lib/pkgconfig/
for i in libssl.pc libcrypto.pc; do
sudo cp $i $i.orig
sudo sed 's,libdir=/opt/homebrew/Cellar/openssl@3/3.3.0$,libdir=/opt/homebrew/Cellar/openssl@3/3.3.0/lib,g' < $i.orig > /tmp/$i
sudo cp /tmp/$i $i
cat $i
done
)
;;
*)
if test -d /usr/local/include/openssl; then
if test -d $BREW/include/openssl; then
brew unlink openssl
fi;;
esac
name: 'brew unlink openssl'

- run: python3 -m pip install impacket
- run: |
python3 -m venv $HOME/venv
source $HOME/venv/bin/activate
python3 -m pip install impacket
name: 'pip3 install'

- uses: actions/checkout@v4
Expand Down Expand Up @@ -209,16 +223,16 @@ jobs:
build:
- name: OpenSSL
install: nghttp2 openssl
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
generate: -DOPENSSL_ROOT_DIR=$BREW/opt/openssl -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
- name: LibreSSL
install: nghttp2 libressl
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
generate: -DOPENSSL_ROOT_DIR=$BREW/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
- name: libssh2
install: nghttp2 openssl libssh2
generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_USE_LIBSSH2=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON
generate: -DOPENSSL_ROOT_DIR=$BREW/opt/openssl -DCURL_USE_LIBSSH2=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON
- name: GnuTLS
install: gnutls
generate: -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=OFF -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON -DCMAKE_SHARED_LINKER_FLAGS=-L/usr/local/lib -DCMAKE_EXE_LINKER_FLAGS=-L/usr/local/lib
generate: -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=OFF -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON -DCMAKE_SHARED_LINKER_FLAGS=-L$BREW/lib -DCMAKE_EXE_LINKER_FLAGS=-L$BREW/lib
steps:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle'
Expand All @@ -231,7 +245,7 @@ jobs:
*openssl*)
;;
*)
if test -d /usr/local/include/openssl; then
if test -d $BREW/include/openssl; then
brew unlink openssl
fi;;
esac
Expand Down