[Reproducible-commits] [dpkg] 54/74: man: Clarify shared library search order in dpkg-shlibdeps(1)

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 1.18.8
in repository dpkg.

commit 4cc48876cca560e72b3b83eece8b4252f812f991
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Jun 14 00:28:00 2016 +0200

    man: Clarify shared library search order in dpkg-shlibdeps(1)
---
 debian/changelog     |  1 +
 man/dpkg-shlibdeps.1 | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a19cfa9..e83d53e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ dpkg (1.18.8) UNRELEASED; urgency=medium
     - Document various long options in dpkg-source --help output.
     - Move dpkg-source -q option from “Build options” to “General options”
       section in --help output.
+    - Clarify shared library search order in dpkg-shlibdeps(1).
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/man/dpkg-shlibdeps.1 b/man/dpkg-shlibdeps.1
index 77c47b7..3465c4a 100644
--- a/man/dpkg-shlibdeps.1
+++ b/man/dpkg-shlibdeps.1
@@ -138,7 +138,7 @@ Include dependencies appropriate for the shared libraries required by
 This option can be used multiple times.
 .TP
 .BI \-l directory
-Add
+Prepend
 .I directory
 to the list of directories to search for private shared libraries
 (since dpkg 1.17.0). This option can be used multiple times.
@@ -323,11 +323,12 @@ The \fIbinary\fR uses a library called \fIlibrary-soname\fR but
 has been unable to find the library.
 .B dpkg\-shlibdeps
 creates a list of directories to check as following: directories listed in
-the RPATH of the binary, directories listed in /etc/ld.so.conf,
-directories added by the \fB\-l\fP option,
-directories listed in the \fBLD_LIBRARY_PATH\fP environment variable, and
-standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64,
-/usr/lib64). Then it checks those directories in the package's build tree
+the RPATH of the binary, directories added by the \fB\-l\fP option, directories
+listed in the \fBLD_LIBRARY_PATH\fP environment variable, cross multiarch
+directories (ex. /lib/arm64-linux-gnu, /usr/lib/arm64-linux-gnu), standard
+public directories (/lib, /usr/lib), directories listed in /etc/ld.so.conf,
+and obsolete multilib directories (/lib32, /usr/lib32, /lib64, /usr/lib64).
+Then it checks those directories in the package's build tree
 of the binary being analyzed, in the packages' build trees indicated with
 the \fB\-S\fP command-line option, in other packages' build trees that contains
 a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root directory.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git