dnsdist: Install the Quiche library in the correct library directory

diff --git a/builder-support/helpers/install_quiche.sh b/builder-support/helpers/install_quiche.sh
index 57656bf2c65336b321cc8abb252ff59558527865..3c82fc9fc56d5d325974bbee4a764599cd7e7106 100755 (executable)
--- a/builder-support/helpers/install_quiche.sh
+++ b/builder-support/helpers/install_quiche.sh
@@ -17,6 +17,11 @@ if [ $(uname) = Darwin ]; then
   INSTALL_PREFIX="${HOMEBREW_PREFIX}"
   SOEXT=dylib
 fi
+LIBDIR="${INSTALL_PREFIX}/lib"
+if [ -d "${INSTALL_PREFIX}/lib64" ]; then
+  # RHEL and co
+  LIBDIR="${INSTALL_PREFIX}/lib64"
+fi
 
 cd /tmp
 echo $0: Downloading ${QUICHE_TARBALL}
@@ -32,23 +37,23 @@ sed -i 's,cdylib_link_lines::metabuild();,//cdylib_link_lines::metabuild();,' qu
 RUST_BACKTRACE=1 cargo build --release --no-default-features --features ffi,boringssl-boring-crate --package quiche
 
 install -m644 quiche/include/quiche.h "${INSTALL_PREFIX}"/include
-install -m644 target/release/libquiche.${SOEXT} "${INSTALL_PREFIX}"/lib/libdnsdist-quiche.${SOEXT}
+install -m644 target/release/libquiche.${SOEXT} "${LIBDIR}"/libdnsdist-quiche.${SOEXT}
 
 if [ $(uname) = Darwin ]; then
-  install_name_tool -id "${INSTALL_PREFIX}"/lib/libdnsdist-quiche.${SOEXT} "${INSTALL_PREFIX}"/lib/libdnsdist-quiche.${SOEXT}
+  install_name_tool -id "${LIBDIR}/libdnsdist-quiche.${SOEXT}" "${LIBDIR}"libdnsdist-quiche.${SOEXT}
 fi
 
-if [ ! -d "${INSTALL_PREFIX}"/lib/pkgconfig/ ]; then
-    mkdir "${INSTALL_PREFIX}"/lib/pkgconfig/
+if [ ! -d "${LIBDIR}"/pkgconfig/ ]; then
+    mkdir "${LIBDIR}"/pkgconfig/
 fi
-install -m644 /dev/stdin "${INSTALL_PREFIX}"/lib/pkgconfig/quiche.pc <<PC
+install -m644 /dev/stdin "${LIBDIR}"/pkgconfig/quiche.pc <<PC
 # quiche
 Name: quiche
 Description: quiche library
 URL: https://github.com/cloudflare/quiche
 Version: ${QUICHE_VERSION}
 Cflags: -I${INSTALL_PREFIX}/include
-Libs: -L${INSTALL_PREFIX}/lib -ldnsdist-quiche
+Libs: -L${LIBDIR} -ldnsdist-quiche
 PC
 
 cd ..

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index bf9da0a1c1dc19cec687ae9d70ed680e8129ed5e..bb7c63441f078a993c6193395c8877f870532194 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -115,7 +115,7 @@ export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/lib64/pkgconfig
 %install
 %meson_install
 install -d %{buildroot}/%{_sysconfdir}/dnsdist
-install -Dm644 /usr/lib/libdnsdist-quiche.so %{buildroot}/%{_libdir}/libdnsdist-quiche.so
+install -Dm644 %{_libdir}/libdnsdist-quiche.so %{buildroot}/%{_libdir}/libdnsdist-quiche.so
 %{__mv} %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf-dist %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf
 chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.conf