commit 25443dd1e0f215944df18fb7445d253be205bd58 from: Thomas Adam date: Sat Jul 16 14:34:37 2022 UTC Revert "portable: ci: macos: add libressl" Remove dependency on libretls as TLS isn't going to be included in gotwebd any time soon. This reverts commit af7f5027866eea7b4299c2319f83d0eb18a395e6. commit - c1be0a434186efbd206455a771bc6e94f16aa4d8 commit + 25443dd1e0f215944df18fb7445d253be205bd58 blob - 01d447d6b96974a584ca3a732fdef62fa2cdea54 blob + 444962dd1cbdb1e71a50917fadcb7d3abef833c0 --- .github/ci/before-install.sh +++ .github/ci/before-install.sh @@ -25,14 +25,12 @@ 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 - 58dab83470526abb153cee6a5b7f6b128e0e5c17 blob + 178dd8ad8004de8363dd292f6a28d820a253e0ff --- .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 -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 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 PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig -I/usr/local/opt/libressl/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig" } ./autogen.sh || exit 1 blob - 0890ec5198afd385e54e69bee2d7730ae2a556bd blob + 03f15740f3c097653dbbe302ddc34e54e5c29483 --- configure.ac +++ configure.ac @@ -59,7 +59,6 @@ AC_CHECK_HEADERS([ \ sys/socket.h \ sys/time.h \ sys/tree.h \ - tls.h \ util.h \ unistd.h \ wchar.h \