mirror of
https://github.com/curl/curl.git
synced 2026-07-25 17:27:22 +03:00
autotools: detect and link brotlicommon library for brotli
`brotlicommon` is necessary when linking brotli statically. E.g. on Alpine Linux with `PKG_CONFIG='pkg-config --static'`. It also syncs brotli libs listed in `libcurl.pc` and `curl-config` with those generated by cmake, which already listed `brotlicommon` there. Also: - remove workaround from GHA/configure-vs-cmake CI jobs. Ref:69cda1b704Follow-up tof2adb3b6d7#15431 Reported-by: Christopher Boyd Fixes #17678 Closes #17723
This commit is contained in:
parent
6c85579c84
commit
4914c2177e
2 changed files with 13 additions and 6 deletions
7
.github/workflows/configure-vs-cmake.yml
vendored
7
.github/workflows/configure-vs-cmake.yml
vendored
|
|
@ -44,10 +44,10 @@ jobs:
|
|||
run: |
|
||||
autoreconf -fi
|
||||
export PKG_CONFIG_DEBUG_SPEW=1
|
||||
mkdir bld-am && cd bld-am && ../configure --enable-static=no --with-openssl --without-libpsl --without-brotli
|
||||
mkdir bld-am && cd bld-am && ../configure --enable-static=no --with-openssl --without-libpsl
|
||||
|
||||
- name: 'run cmake'
|
||||
run: cmake -B bld-cm -DCURL_WERROR=ON -DCURL_USE_LIBPSL=OFF -DCURL_BROTLI=OFF
|
||||
run: cmake -B bld-cm -DCURL_WERROR=ON -DCURL_USE_LIBPSL=OFF
|
||||
|
||||
- name: 'configure log'
|
||||
run: cat bld-am/config.log 2>/dev/null || true
|
||||
|
|
@ -90,13 +90,12 @@ jobs:
|
|||
run: |
|
||||
autoreconf -fi
|
||||
export PKG_CONFIG_DEBUG_SPEW=1
|
||||
mkdir bld-am && cd bld-am && ../configure --enable-static=no --with-openssl --without-libpsl --disable-ldap --with-zstd
|
||||
mkdir bld-am && cd bld-am && ../configure --enable-static=no --with-openssl --without-libpsl --disable-ldap --with-brotli --with-zstd
|
||||
|
||||
- name: 'run cmake'
|
||||
run: |
|
||||
cmake -B bld-cm -DCURL_WERROR=ON -DCURL_USE_LIBPSL=OFF -DCURL_DISABLE_LDAP=ON \
|
||||
-DCMAKE_C_COMPILER_TARGET="$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
||||
-DCURL_BROTLI=OFF \
|
||||
-DCURL_USE_LIBSSH2=OFF
|
||||
|
||||
- name: 'configure log'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue