disable dh_strip workaround. rlibs will have all debuginfo, they are not in dbgsym packages anyway

This commit is contained in:
Ximin Luo 2020-01-07 12:47:26 +00:00
parent 2502df6551
commit b676ddf6b4
2 changed files with 16 additions and 8 deletions

3
debian/changelog vendored
View File

@ -2,6 +2,9 @@ rustc (1.40.0+dfsg1-6) UNRELEASED; urgency=medium
* More python 2 -> 3 fixes.
* Enable the wasm32-wasi target for code that needs a "real" libstd.
* Don't strip static rlibs. This sometimes breaks wasm, and more generally
the stripped debuginfo is actually totally lost rather than being moved
into the -dbgsym packages. Shared libraries are unaffected and work.
-- Ximin Luo <infinity0@debian.org> Sun, 05 Jan 2020 16:53:53 +0000

21
debian/rules vendored
View File

@ -382,14 +382,19 @@ override_dh_missing:
override_dh_compress:
dh_compress -X.woff
override_dh_strip:
# Work around #35733, #468333
find debian/libstd-rust-dev*/ -name '*.rlib' -execdir mv '{}' '{}.a' \;
# This is expected to print out lots of "File format unrecognized" warnings about
# rust.metadata.bin and *.deflate but the .o files inside the rlibs should be stripped
# Some files are still omitted because of #875780 however.
dh_strip -v
find debian/libstd-rust-dev*/ -name '*.rlib.a' -execdir sh -c 'mv "$$1" "$${1%.a}"' - '{}' \;
# The below override is disabled on advice from #debian-devel, because:
# - only shared libs get the "split dbgsym package" treatment by dh_strip;
# static libs simply get their debuginfo discarded
# - strip(1) sometimes breaks wasm libs
#
#override_dh_strip:
# # Work around #35733, #468333
# find debian/libstd-rust-dev*/ -name '*.rlib' -execdir mv '{}' '{}.a' \;
# # This is expected to print out lots of "File format unrecognized" warnings about
# # rust.metadata.bin and *.deflate but the .o files inside the rlibs should be stripped
# # Some files are still omitted because of #875780 however.
# dh_strip -v
# find debian/libstd-rust-dev*/ -name '*.rlib.a' -execdir sh -c 'mv "$$1" "$${1%.a}"' - '{}' \;
override_dh_makeshlibs:
dh_makeshlibs -V