From 68d9d20c7974fdd9b7a4caf2c47b11ed1bca7b32 Mon Sep 17 00:00:00 2001 From: Ubuntu Developers Date: Sat, 14 May 2022 00:51:31 +0800 Subject: [PATCH] Do not print standard multiarch path {/usr,}/lib/i386-linux-gnu are in the standard search path, there is no need to explicitly point gcc there with a -L argument. Also we are installing the actual library and the so-symlink in different locations which makes this incorrect no matter which one we choose. Origin: vendor Forwarded: not-needed Gbp-Pq: Name 15_multiarchpath_in_-L.diff --- src/libgcrypt-config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in index 4d508e2..b333448 100644 --- a/src/libgcrypt-config.in +++ b/src/libgcrypt-config.in @@ -152,9 +152,10 @@ fi if test "$echo_libs" = "yes"; then libdirs="" libs_final="$libs" + debianmultiarch=`if which dpkg-architecture > /dev/null ; then dpkg-architecture -qDEB_HOST_MULTIARCH ; fi` # Set up `libdirs'. - if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then + if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib" -a "x$libdir" != "x/lib/${debianmultiarch}" ; then libdirs="-L$libdir" fi