Update config.toml, lintian-overrides

This commit is contained in:
Ximin Luo 2017-07-17 21:04:42 +02:00
parent a3c295ccb9
commit 3613a4e9ef
4 changed files with 6 additions and 12 deletions

View File

@ -3,8 +3,6 @@ submodules = false
vendor = true
locked-deps = false
channel = "RELEASE_CHANNEL"
build = "DEB_BUILD_RUST_TYPE"
host = ["DEB_HOST_RUST_TYPE"]
target = ["DEB_TARGET_RUST_TYPE"]
@ -33,6 +31,8 @@ link-shared = true
[rust]
dist-src = false
channel = "RELEASE_CHANNEL"
codegen-units = 0
debuginfo = true
debuginfo-lines = true

View File

@ -4,13 +4,8 @@ libstd-rust-1.18 binary: package-name-doesnt-match-sonames
# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
libstd-rust-1.18 binary: dev-pkg-without-shlib-symlink
libstd-rust-1.18 binary: shlib-without-versioned-soname
libstd-rust-1.18 binary: pkg-has-shlibs-control-file-but-no-actual-shared-libs
libstd-rust-1.18 binary: package-must-activate-ldconfig-trigger
# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
# to libc. Lintian gets upset that some Rust libraries don't need
# libc, boo hoo.
libstd-rust-1.18 binary: library-not-linked-against-libc
# We need it for now
binary-or-shlib-defines-rpath usr/lib/*/lib*so /usr/lib/rustlib/*lib

6
debian/rules vendored
View File

@ -38,13 +38,15 @@ SED_RUSTC_BUILDDEP := sed -ne "/^Build-Depends:/,/^[^[:space:]\#]/{/^ *rustc:nat
# These are the normal build flags. Upstream is moving to debian/config.toml
# but at the current version not all of these flags are available in that file.
DEB_CONFIGURE_FLAGS = --enable-llvm-link-shared --disable-dist-src --prefix=/usr
# Certain flags also need to be kept here *as well as* debian/config.toml.in
# because of https://github.com/rust-lang/rust/issues/43295
DEB_CONFIGURE_FLAGS = --enable-llvm-link-shared --disable-dist-src --prefix=/usr --release-channel=$(RELEASE_CHANNEL)
# Use system LLVM (comment out to use vendored LLVM)
OLD_LLVM_VERSION = 3.8
DEB_CONFIGURE_FLAGS += --llvm-root=/usr/lib/llvm-3.9
RUSTBUILD = ./x.py
RUSTBUILD_FLAGS = --config debian/config.toml -v
RUSTBUILD_FLAGS = --config debian/config.toml -v --on-fail env
update-version:
oldver=$(shell $(SED_RUSTC_BUILDDEP) | sed -ne 's/.*(<= \(.*\)).*/\1/gp' | $(SED_VERSION_SHORT)); \

View File

@ -1,3 +0,0 @@
# We need it for now
binary-or-shlib-defines-rpath usr/bin/rustc /usr/lib/rustlib/*/lib
binary-or-shlib-defines-rpath usr/bin/rustdoc /usr/lib/rustlib/*/lib