From a54afe182e85bd46c2753122ba12d2b214b403de Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 23 May 2025 09:42:38 +0200 Subject: [PATCH] install quiche helper: do not use -i without arg and add missing / on Darwin BSD sed does not like -i without arg --- builder-support/helpers/install_quiche.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder-support/helpers/install_quiche.sh b/builder-support/helpers/install_quiche.sh index 5f5a93e05a..cbdad171bf 100755 --- a/builder-support/helpers/install_quiche.sh +++ b/builder-support/helpers/install_quiche.sh @@ -38,8 +38,8 @@ echo "${QUICHE_TARBALL_HASH}" "${QUICHE_TARBALL}" | sha256sum -c - tar xf "${QUICHE_TARBALL}" cd "quiche-${QUICHE_VERSION}" # Disable SONAME in the quiche shared library, we do not intend this library to be used by anyone else and it makes things more complicated since we rename it to libdnsdist-quiche -sed -i 's/ffi = \["dep:cdylib-link-lines"\]/ffi = \[\]/' quiche/Cargo.toml -sed -i 's,cdylib_link_lines::metabuild();,//cdylib_link_lines::metabuild();,' quiche/src/build.rs +sed -i.bak 's/ffi = \["dep:cdylib-link-lines"\]/ffi = \[\]/' quiche/Cargo.toml +sed -i.bak 's,cdylib_link_lines::metabuild();,//cdylib_link_lines::metabuild();,' quiche/src/build.rs RUST_BACKTRACE=1 cargo build --release --no-default-features --features ffi,boringssl-boring-crate --package quiche # While we tried to get rid of the SONAME in libquiche.so, on debian trixie's @@ -55,7 +55,7 @@ install -m644 quiche/include/quiche.h "${INSTALL_PREFIX}"/include install -m644 target/release/libquiche.${SOEXT} "${LIBDIR}"/libdnsdist-quiche.${SOEXT} if [ $(uname) = Darwin ]; then - install_name_tool -id "${LIBDIR}/libdnsdist-quiche.${SOEXT}" "${LIBDIR}"libdnsdist-quiche.${SOEXT} + install_name_tool -id "${LIBDIR}/libdnsdist-quiche.${SOEXT}" "${LIBDIR}/"libdnsdist-quiche.${SOEXT} fi if [ ! -d "${LIBDIR}"/pkgconfig/ ]; then -- 2.47.2