summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2019-10-16 19:52:50 +0000
committerNiels Thykier <niels@thykier.net>2019-10-16 19:52:50 +0000
commit52ee21d763e3bd1d6adc2a6183fcf9510151a80d (patch)
treef232ddbe1a0c58b0cbac94dbc9205448d70e922a
parent86f001d464d4e0eb6e57ebc6a0c79dd83e410609 (diff)
downloaddebhelper-52ee21d763e3bd1d6adc2a6183fcf9510151a80d.tar.gz
dh_makeshlibs: Suggest --no-add-udeb for some cases
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog5
-rwxr-xr-xdh_makeshlibs7
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e2e970f..5236d975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ debhelper (12.7) UNRELEASED; urgency=medium
option for resetting the cache (of e.g. dpkg-buildflags).
This is needed by e.g. parted which does two builds with
different CFLAGS.
+ * dh_makeshlibs: Suggest/Document that --no-add-udeb can be
+ relevant for some udebs where the shared library for the udeb
+ is embedded in a different package (e.g. the main udeb
+ package). Thanks to Nicolas Braud-Santoni for reporting the
+ issue. (Closes: #942454)
[ Helmut Grohne ]:
* cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms.
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 33ed26b1..5ccfac07 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -171,6 +171,11 @@ contains libraries B<not> present in the deb package.
Do not add any udeb lines to the shlibs file. This can be used to disable the
default auto-detection of udebs.
+This may be useful in case you do not want a shlibs file at all for the udeb
+because no package will depend on it. E.g. because adding a udeb package
+for the library was "overkill" and the library is embedded in a different
+udeb package.
+
=item B<--> I<params>
Pass I<params> to L<dpkg-gensymbols(1)>.
@@ -380,6 +385,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
warning("Hint: Either add the missing libraries to $package, remove them from $udeb_name, or");
warning("Hint: (if this difference is expected) pass \"--add-udeb=$udeb_name\" to dh_makeshlibs.");
warning("Hint: In the latter case, you *may* also need to combine it with \"-p$package\"");
+ warning("Hint: Alternatively, if you have merged the shared lib package into $udeb_name and it has no");
+ warning("Hint: other packages need to know of this library, then use \"--no-add-udeb\"");
}
}