1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
|
Description: 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
--- a/src/libgcrypt-config.in
+++ b/src/libgcrypt-config.in
@@ -164,9 +164,10 @@
if test "$echo_libs" = "yes"; then
libdirs=""
libs_final="$libs"
+ debianmultiarch=`if command -v 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
|