commit af7f5027866eea7b4299c2319f83d0eb18a395e6 from: Thomas Adam date: Sat Jul 16 12:31:04 2022 UTC portable: ci: macos: add libressl commit - 2fcd7106f2aa3a29b122a3b91fb27e0ffdb00a8c commit + af7f5027866eea7b4299c2319f83d0eb18a395e6 blob - 444962dd1cbdb1e71a50917fadcb7d3abef833c0 blob + 01d447d6b96974a584ca3a732fdef62fa2cdea54 --- .github/ci/before-install.sh +++ .github/ci/before-install.sh @@ -25,12 +25,14 @@ if [ "$CIRRUS_OS" = "freebsd" ]; then pkgconf \ git \ libevent \ + libretls \ coreutils fi if [ "$CIRRUS_OS" = "darwin" ]; then brew install autoconf \ automake \ + bison \ pkg-config \ ncurses \ ossp-uuid \ blob - 178dd8ad8004de8363dd292f6a28d820a253e0ff blob + 58dab83470526abb153cee6a5b7f6b128e0e5c17 --- .github/ci/build.sh +++ .github/ci/build.sh @@ -2,10 +2,10 @@ [ "$CIRRUS_OS" = "darwin" ] && { export PATH="/usr/local/opt/bison/bin:$PATH" - export LDFLAGS="-L/usr/local/opt/ncurses/lib -L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/ncurses/include -I/usr/local/opt/openssl@3/include" + export LDFLAGS="-L/usr/local/opt/ncurses/lib -L/usr/local/opt/openssl@3/lib -L/usr/local/opt/libressl/lib" + export CPPFLAGS="-I/usr/local/opt/ncurses/include -I/usr/local/opt/openssl@3/include -I/usr/local/opt/libressl/include" export PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig -I/usr/local/opt/libressl/lib/pkgconfig" } ./autogen.sh || exit 1 blob - 2c9426d06a1fc29e13aa4557bd43b089517fbfb0 blob + 1ccc590844e14535156422b3817ceee8feb57bd4 --- configure.ac +++ configure.ac @@ -59,6 +59,7 @@ AC_CHECK_HEADERS([ \ sys/socket.h \ sys/time.h \ sys/tree.h \ + tls.h \ util.h \ unistd.h \ wchar.h \