From: Ximin Luo Date: Tue, 25 Jul 2017 21:19:47 +0000 (+0100) Subject: Import rustc_1.18.0+dfsg1-4.debian.tar.xz X-Git-Tag: archive/raspbian/1.19.0+dfsg3-4+rpi1~1^2~30^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c9b56d86bbdfa3de2ad3ccb48cc1a807021de394;p=rustc.git Import rustc_1.18.0+dfsg1-4.debian.tar.xz [dgit import tarball rustc 1.18.0+dfsg1-4 rustc_1.18.0+dfsg1-4.debian.tar.xz] --- c9b56d86bbdfa3de2ad3ccb48cc1a807021de394 diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000000..999a817a4d --- /dev/null +++ b/README.Debian @@ -0,0 +1,150 @@ +Shared libraries +================ + +For now, the shared libraries of Rust are private. +The rational is the following: + * Upstream prefers static linking for now + - https://github.com/rust-lang/rust/issues/10209 + * rust is still under heavy development. As far as we know, there is + no commitement from upstream to provide a stable ABI for now. + Until we know more, we cannot take the chance to have Rust-built packages + failing at each release of the compiler. + * Static builds are working out of the box just fine + * However, LD_LIBRARY_PATH has to be updated when -C prefer-dynamic is used + + -- Sylvestre Ledru , Fri, 13 Feb 2015 15:08:43 +0100 + + +Cross-compiling +=============== + +Rust uses LLVM, so cross-compiling works a bit differently from the GNU +toolchain. The most important difference is that there are no "cross" +compilers, every compiler is already a cross compiler. All you need to do is +install the standard libraries for each target architecture you want to compile +to. For rustc, this is libstd-rust-dev, so your debian/control would look +something like this: + + Build-Depends: + [..] + rustc:native (>= $version), + libstd-rust-dev (>= $version), + [..] + +You need both, this is important. When Debian build toolchains satisfy the +build-depends of a cross-build, (1) a "rustc:native" Build-Depends selects +rustc for the native architecture, which is possible because it's "Multi-Arch: +allowed", and this will implicitly pull in libstd-rust-dev also for the native +architecture; and (2) a "libstd-rust-dev" Build-Depends implies libstd-rust-dev +for the foreign architecture, since it's "Multi-Arch: same". + +You'll probably also want to add + + include /usr/share/rustc/architecture.mk + +to your debian/rules. This sets some useful variables like DEB_HOST_RUST_TYPE. + +See the cargo package for an example. + +Terminology +----------- + +The rust ecosystem generally uses the term "host" for the native architecture +running the compiler, equivalent to DEB_BUILD_RUST_TYPE or "build" in GNU +terminology, and "target" for the foreign architecture that the build products +run on, equivalent to DEB_HOST_RUST_TYPE or "host" in GNU terminology. For +example, rustc --version --verbose will output something like: + + rustc 1.16.0 + [..] + host: x86_64-unknown-linux-gnu + +And both rustc and cargo have --target flags: + + $ rustc --help | grep '\-\-target' + --target TARGET Target triple for which the code is compiled + $ cargo build --help | grep '\-\-target' + --target TRIPLE Build for the target triple + +One major exception to this naming scheme is in CERTAIN PARTS OF the build +scripts of cargo and rustc themselves, such as the `./configure` scripts and +SOME PARTS of the `config.toml` files. Here, "build", "host" and "target" mean +the same things they do in GNU toolchain terminology. However, IN OTHER PARTS +OF the build scripts of cargo and rustc, as well as cargo and rustc's own +output and logging messages, the term "host" and "target" mean as they do in +the previous paragraph. Yes, it's a total mind fuck. :( Table for clarity: + +======================================= =============== ======================== +GNU term / Debian envvar Rust ecosystem, Some parts of the rustc + rustc and cargo and cargo build scripts +======================================= =============== ======================== +build DEB_BUILD_{ARCH,RUST_TYPE} host build + the machine running the build +--------------------------------------- --------------- ------------------------ +host DEB_HOST_{ARCH,RUST_TYPE} target host(s) + the machine the build products run on +--------------------------------------- --------------- ------------------------ +only relevant when building a compiler +target DEB_TARGET_{ARCH,RUST_TYPE} N/A target(s) + the one architecture that the built extra architectures + cross-compiler itself builds for to build "std" for +--------------------------------------- --------------- ------------------------ + + +Porting to new architectures (on the same distro) +================================================= + +As mentioned above, to cross-compile rust packages you need to install the rust +standard library for each relevant foreign architecture. However, this is not +needed when cross-compiling rustc itself; its build system will build any +relevant foreign-architecture standard libraries automatically. + +Cross-build, in a schroot using sbuild +-------------------------------------- + +0. Set up an schroot for your native architecture, for sbuild: + + sudo apt-get install sbuild + sudo sbuild-adduser $LOGNAME + newgrp sbuild # or log out and log back in + sudo sbuild-createchroot --include=eatmydata,ccache,gnupg unstable \ + /srv/chroot/unstable-$(dpkg-architecture -qDEB_BUILD_ARCH)-sbuild \ + http://deb.debian.org/debian + + See https://wiki.debian.org/sbuild for more details. + +1. Build it: + + sudo apt-get source --download-only rustc + sbuild --host=$new_arch rustc_*.dsc + +Cross-build, directly on your own system +---------------------------------------- + +0. Install the build-dependencies of rustc (including cargo and itself): + + sudo dpkg --add-architecture $new_arch + sudo apt-get --no-install-recommends build-dep --host-architecture=$new_arch rustc + +1. Build it: + + apt-get source --compile --host-architecture=$new_arch rustc + +Native-build using bundled upstream binary blobs +------------------------------------------------ + +Use the same instructions as given in "Bootstrapping" in debian/README.source +in the source package, making sure to set the relevant architectures. + +Responsible distribution of cross-built binaries +------------------------------------------------ + +By nature, cross-builds do not run tests. These are important for rustc and +many tests often fail on newly-supported architectures even if builds and +cross-builds work fine. You should find some appropriate way to test your +cross-built packages rather than blindly shipping them to users. + +For example, Debian experimental is an appropriate place to upload them, so +that they can be installed and tested on Debian porter boxes, before being +uploaded to unstable and distributed to users. + diff --git a/README.source b/README.source new file mode 100644 index 0000000000..0b26fd914c --- /dev/null +++ b/README.source @@ -0,0 +1,150 @@ +Document by Luca Bruno & Sylvestre Ledru + +This source package is unfortunately quite tricky and with +several cutting edges, due to the complexity of rust-lang +bootstrapping system and the high rate of language changes +still ongoing. + +We try to describe here inner packaging details and the +reasons behind them. + + +Import of a new upstream version +================================ + +$ uscan +$ gbp import-orig --upstream-branch=upstream/experimental --debian-branch=debian/experimental ../rustc_X.YY.0+dfsg1.orig.tar.xz +$ dch -v X.YY.0+dfsg1-1 +$ debian/rules update-version +# might also need to bump the version of the cargo Build-Depends + + +Embedded libraries +================== + +This source package embeds several external libraries (foeked and managed +by rust upstream as git submodules). +In early stages, many more libraries were forked/emebedded but we are steadily +progressing in splitting them out. + +Here below the remaining ones, with the technical reasons. + + * jemalloc from https://github.com/rust-lang/jemalloc + -> system-wide one can't be used due to rust using a "je_" prefix. + + This is intentional upstream design and won't change soon, see: + - https://github.com/rust-lang/rust/pull/18678 + - http://smallcultfollowing.com/babysteps/blog/2014/11/14/allocators-in-rust/ + + * compiler-rt from https://github.com/rust-lang/compiler-rt + -> system-wide compiler-rt fails during linkage + + Bug reported upstream, still to be fixed, see: + - https://github.com/rust-lang/rust/issues/15054 + - https://github.com/rust-lang/rust/issues/15708 + +As a summary, we plan to: + * keep embedding jemalloc (probably forever) + * work with upstream to fix compiler-rt linkage soon. + + -- Sylvestre Ledru Sat, 06 May 2017 13:26:08 +0200 + + +Building from source +==================== + +The Debian rustc package will use the system rustc to bootstrap itself from. +The system rustc has to be either the previous or the same version as the rustc +being built; the build will fail if this is not the case. + + sudo apt-get build-dep ./ + dpkg-buildpackage + # Or, to directly use what's in the Debian FTP archive + sudo apt-get build-dep rustc + apt-get source --compile rustc + +Alternatively, you may give the "pkg.rustc.dlstage0" DEB_BUILD_PROFILE to +instead use the process defined by Rust upstream. This downloads the "official" +stage0 compiler for the version being built from rust-lang.org. At the time of +writing "official" means "the previous stable version". + + sudo apt-get build-dep -P pkg.rustc.dlstage0 ./ + dpkg-buildpackage + # Or, to directly use what's in the Debian FTP archive + sudo apt-get build-dep -P pkg.rustc.dlstage0 rustc + apt-get source --compile -P pkg.rustc.dlstage0 rustc + +After [1] is fixed, both of these should in theory give identical results. + +If neither of these options are acceptable to you, e.g. because your distro +does not have rustc already and your build process cannot access the network, +see "Bootstrapping" below. + +[1] https://github.com/rust-lang/rust/issues/34902 + + +Bootstrapping +============= + +To bootstrap rustc on a distro that does not have it or cargo available on any +architecture (so cross-compiling is not an option) you can run `debian/rules +source_orig-stage0`. This creates a .dsc that does not Build-Depend on rustc or +cargo. Instead, it includes an extra orig-stage0 source tarball that contains +the official stage0 compiler, pre-downloaded from rust-lang.org so that your +build daemons don't need to access the network during the build. + + debian/rules source_orig-stage0 + # Follow the final manual instructions that it outputs. Then: + sbuild ../rustc_*.dsc && dput ../rustc_*.dsc + +To only bootstrap specific architectures, run this instead: + + upstream_bootstrap_arch="arm64 armhf" debian/rules source_orig-stage0 + +This way, other architectures will be omitted from the orig-stage0 tarball. You +might want to do this e.g. if these other architectures are already present in +your distro, but the $upstream_bootstrap_arch ones are not yet present. + +Notes +----- + +The approach bundles the upstream bootstrapping binaries inside the Debian +source package. This is a nasty hack that stretches the definition of "source +package", but has a few advantages explained below. + +The traditional Debian way of bootstrapping compilers - and other distros have +similar approaches - is some variant of the following: + +1. A developer locally installs some upstream bootstrapping binaries. +2. They locally build a Debian package, using these binaries as undeclared + build dependencies. +3. They upload these binary packages to Debian, which can be used as declared + Build-Depends in the future, including by the same package. + +The problem with this is, Debian does not have any policy nor infrastructure +that can try to reproduce what this developer supposedly did. + +Using bootstrapping binary blobs *at some point of the process* is unavoidable. +Rather than pretending we didn't do this, it is better to record *which blobs* +we used, so it can be audited later. If we bundle non-Debian build-dependencies +inside the source package, then we can do a *source-only upload*, and the +building of the binary packages can be done by the normal build infrastructure. + +If the build process is reproducible [1] then we can be sure that *you* (as the +developer that prepared the source-only upload) didn't backdoor the binaries, +nor did the build daemons even if they were compromised during the build. + +The bootstrapping binaries may still have been backdoored, but this is true in +both scenarios. So our arrangement is still a strict improvement in security, +because it reduces the set of "things that may have been backdoored". Also, +more people use the upstream binaries than the "magical original Debian +package", so backdoors have a greater chance of being detected in the former. + +In the long run, this process is laying the foundations for doing Diverse +Double-Compilation [2], where we use *many independent* bootstrapping binaries +to reproduce bit-for-bit identical output compilers, giving confidence that +nothing was backdoored along the way. + +[1] The build process for rustc is currently *not* reproducible but we're + working towards it. https://github.com/rust-lang/rust/issues/34902 +[2] http://www.dwheeler.com/trusting-trust/ diff --git a/TODO.Debian b/TODO.Debian new file mode 100644 index 0000000000..1e3a7d307f --- /dev/null +++ b/TODO.Debian @@ -0,0 +1,29 @@ +Long build time +=============== + + * Seems to be fixed with 1.17.0 and rustbuild. + + * Try to investigate the 1 hour vs 7 hour build time difference we saw between + git diff debian/1.13.0+dfsg1-2..debian/1.14.0+dfsg1-1 -- debian + + infinity0: LLVM [in Rust]? + infinity0: ./configure --enable-debug has this annoying detail that nobody has fixed yet, that it disabled optimizations + so you always have to add --enable-optimize or something like that to counteract the negative effect + unoptimized rustc is *very* slow, in fact it's my sole guess for 7 hours, assuming you didn't just simply lose 8x parallelism or something + + infinity0: -Z time-passes between two different compilers, on the same test, would also be pretty revealing + infinity0: also try timing the entire compile-fail test run between stage1/bin/rustc and stage2/bin/rustc (the latter is what running tests uses by default) + infinity0: in the old thing [pre-rustbuild makefiles] it's... make check-stage1-cfail, I think + +Older backlog +============= + + * Use Compiler-rt package + * Improve the bootstrap (do the local build first on our systems, upload + to Debian and use the packages) + * Port on other archs + * Create a runtime package (rust-runtime) + * Move the runtime library into a public directory + * Package the various editors plugins (emacs, kate & vim) + + -- Sylvestre Ledru Tue, 20 Jan 2015 08:50:28 +0100 diff --git a/architecture-test.mk b/architecture-test.mk new file mode 100644 index 0000000000..e7aeabade5 --- /dev/null +++ b/architecture-test.mk @@ -0,0 +1,16 @@ +# Used for testing architecture.mk, and for make_orig-stage0_tarball.sh. +# Not for end users. +# +# Usage: +# $ make -s --no-print-directory -f debian/architecture-test.mk rust-for-deb_arm64 +# arm64 aarch64-unknown-linux-gnu + +include debian/architecture.mk + +deb_arch_setvars = $(foreach var,ARCH ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE MULTIARCH,\ + $(eval DEB_$(1)_$(var) = $(shell dpkg-architecture -a$(1) -qDEB_HOST_$(var) 2>/dev/null))) + +rust-for-deb_%: + $(eval $(call deb_arch_setvars,$*)) + $(eval $(call rust_type_setvar,DEB_$*)) + @echo $(DEB_$(*)_ARCH) $(DEB_$(*)_RUST_TYPE) diff --git a/architecture.mk b/architecture.mk new file mode 100644 index 0000000000..daeda01b97 --- /dev/null +++ b/architecture.mk @@ -0,0 +1,14 @@ +# This Makefile snippet defines DEB_*_RUST_TYPE triples based on DEB_*_GNU_TYPE + +include /usr/share/dpkg/architecture.mk + +rust_cpu = $(subst i586,i686,$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),$(1))) +rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM) + +$(foreach machine,BUILD HOST TARGET,\ + $(eval $(call rust_type_setvar,DEB_$(machine)))) + +# fallback for older dpkg versions +ifeq ($(DEB_TARGET_RUST_TYPE),-unknown-) + DEB_TARGET_RUST_TYPE = $(DEB_HOST_RUST_TYPE) +endif diff --git a/bin/grun b/bin/grun new file mode 100755 index 0000000000..394adc6758 --- /dev/null +++ b/bin/grun @@ -0,0 +1,5 @@ +#!/bin/sh +# TODO(infinity0): this can be removed when antlr4 provide this as a convenience script +# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=814253 for details. +# Don't forget to update override_dh_auto_configure when you remove it. +exec java -cp /usr/share/java/antlr4.jar:/usr/share/java/antlr4-runtime.jar org.antlr.v4.gui.TestRig "$@" diff --git a/build-preview-dsc.sh b/build-preview-dsc.sh new file mode 100755 index 0000000000..8748a4f13e --- /dev/null +++ b/build-preview-dsc.sh @@ -0,0 +1,141 @@ +#!/bin/sh +# NOTE: this script very likely does not work any more, don't try to use it +# unless you're very familiar with the rest of the packaging. +# +# Build a Debian source package out of an existing unpacked rustc deb source, +# and the official rust preview releases. +# +# infinity0 occasionally makes, builds and uploads them here: +# https://launchpad.net/~infinity0/+archive/ubuntu/rust-nightly +# https://launchpad.net/~infinity0/+archive/ubuntu/rust-beta + +# You can set these env vars to tweak the behaviour of this script. +CHANNEL="${CHANNEL:-beta}" # either beta or nightly +DIST="${DIST:-experimental}" # which suite to put in debian/changelog +DEBDIR="${DEBDIR:-}" # where is the debian/ directory? defaults to this script +NOREMOTE="${NOREMOTE:-false}" # e.g. if you have already downloaded all necessary files +# note that we already use "wget -N" to avoid redundant downloads +NOCLOBBER="${NOCLOBBER:-true}" # don't rebuild if we already have the .dsc +DPUT_HOST="${DPUT_HOST}" # optional host dput the resulting .dsc to +ARCHES="amd64 arm64 i386" + +do_temporary_fixups() { +# patches needed to subsequent versions go here +local verprefix="${1%.0-beta.?}" +verprefix="${verprefix%.0-nightly}" +( cd debian/patches +local f +for f in *; do + fb="${f%.patch}" + fb="${fb%.diff}" + # if an updated patch exists, use it + if test -f "${fb}_${verprefix}"*; then mv "${fb}_${verprefix}"* "$f"; fi +done ) +case "$1" in +"1.14."*|"1.15."*) + dquilt delete ignore-stdcall-test-on-arm64.patch + ;; +esac +} + +abort() { local x="$1"; shift; echo >&2 "$@"; exit "$x"; } + +dquilt() { + QUILT_PATCHES="debian/patches" \ + QUILT_PATCH_OPTS="--reject-format=unified" \ + QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" \ + QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" \ + quilt "$@" +} + +HOST="https://static.rust-lang.org" +BASENAME="rustc-$CHANNEL-src.tar.gz" +JQUERY="https://code.jquery.com/jquery-2.1.4.js" + +SCRIPTDIR="$(dirname "$0")" +DEBDIR="$(readlink -f ${DEBDIR:-$SCRIPTDIR})" +echo "using DEBDIR=$DEBDIR as debian tree to copy into upstream tarball" +test "$PWD" = "${PWD#$DEBDIR}" || abort 1 "must run from outside DEBDIR" +test -d "$DEBDIR" || abort 1 "DEBDIR not a directory: $DEBDIR" + +set -x +set -e + +$NOREMOTE || wget -N "$HOST/dist/$BASENAME" +$NOREMOTE || wget -N "$HOST/dist/$BASENAME.asc" +$NOREMOTE || gpg2 -v "$BASENAME.asc" +$NOREMOTE || wget -N "$HOST/dist/index.txt" +MODDATE1="$(grep "^/dist/$BASENAME," index.txt \ + | cut -d, -f3 | sed -e 's/\(.*\)-\(.*\)-\(.*\)T.*/\1\2\3/')" +MODDATE2="$(TZ=UTC stat "$BASENAME" -c %y | sed -e 's/\(.*\)-\(.*\)-\([0-9]*\) .*$/\1\2\3/')" +$NOREMOTE || test "$MODDATE1" = "$MODDATE2" || abort 2 "file mod times don't match, try again" +$NOREMOTE || wget -N "$JQUERY" + +rm -rf "rustc-$CHANNEL" +tar xf "$BASENAME" + +cd "rustc-$CHANNEL" +{ + echo "CFG_RELEASE_CHANNEL=$CHANNEL" + echo "CFG_HASH_COMMAND=md5sum | cut -c1-8" + sed -n -e '/^CFG_RELEASE/,/^##/{/^CFG_INFO/d;p}' mk/main.mk + echo "all:" + echo " @echo export CFG_RELEASE=\$(CFG_RELEASE)" +} | make -f - > ./envvars +. ./envvars +NEWUPSTR="$(echo "$CFG_RELEASE.$MODDATE2+dfsg1" | sed -e 's/-beta/~beta/' -e 's/-nightly/~~nightly/')" +if $NOCLOBBER && test -f "../rustc_$NEWUPSTR-1.dsc"; then + cd .. + rm -rf "rustc-$CHANNEL" + abort 0 "already have rustc_$NEWUPSTR-1.dsc; set NOCLOBBER=false if you want to force" +fi +cp -a "$DEBDIR" . +mk-origtargz --repack --compression xz -v "$NEWUPSTR" "../$BASENAME" +cd .. + +rm -rf "rustc-$CHANNEL" "rustc-$NEWUPSTR" +tar xf "rustc_$NEWUPSTR.orig.tar.xz" +mv "rustc-$CHANNEL" "rustc-$NEWUPSTR" + +libstd_ver() { + dpkg-parsechangelog --show-field Version | sed -re 's/([^.]+)\.([^.]+)\..*/\1.\2/' +} + +cd "rustc-$NEWUPSTR" +cp -a "$DEBDIR" . + +OLD_LIBVER="$(libstd_ver)" +dch -D "$DIST" -v "$NEWUPSTR-1" "Team upload." +dch -a "Switch to $CHANNEL channel." +NEW_LIBVER="$(libstd_ver)" +do_temporary_fixups "$CFG_RELEASE" +mkdir -p ../"dl_${CFG_RELEASE}" +ln -sf ../"dl_${CFG_RELEASE}" dl +# TODO: don't do this if orig-dl already exists +$NOREMOTE || upstream_bootstrap_arch="$ARCHES" debian/rules source_orig-dl +rm -f dl +cp -al ../"dl_${CFG_RELEASE}" dl +# set build-dep arch exceptions +deb_bd_arch_ex="$(echo "$ARCHES" | sed -e 's/\S*/!\0/g')" +sed -e 's/rustc (\(.*\))\( *\[\(.*\)\]\)\?/rustc (\1) ['"$deb_bd_arch_ex"']/g' -i debian/control + +rm -f debian/missing-sources/jquery-* +cp "../$(basename "$JQUERY")" debian/missing-sources +sed -i -e "s/$OLD_LIBVER/$NEW_LIBVER/" "debian/control" +sed -i -e 's/\(RELEASE_CHANNEL := \)\(.*\)/\1'"$CHANNEL"'/g' debian/rules +sed -i -e 's/^update .*/update '"$OLD_LIBVER $NEW_LIBVER"'/' debian/update-version.sh +( cd debian && bash ./update-version.sh ) + +while dquilt push; do dquilt refresh; done +dquilt pop -a +rm -rf .pc +dpkg-buildpackage -d -S +cd .. + +if test -n "$DPUT_HOST"; then + dput "$DPUT_HOST" "rustc_$NEWUPSTR-1_source.changes" +else + set +x + echo "Source package built, but there is NO GUARANTEE THAT IT WORKS!" + echo "You should now try to build it with \`sudo cowbuilder --build rustc_$NEWUPSTR-1.dsc\`" +fi diff --git a/changelog b/changelog new file mode 100644 index 0000000000..2a086ac772 --- /dev/null +++ b/changelog @@ -0,0 +1,510 @@ +rustc (1.18.0+dfsg1-4) unstable; urgency=medium + + * Support gperf 3.1. (Closes: #869610) + + -- Ximin Luo Tue, 25 Jul 2017 23:19:47 +0200 + +rustc (1.18.0+dfsg1-3) unstable; urgency=medium + + * Upload to unstable. + * Disable failing run-make test on armhf. + + -- Ximin Luo Sat, 22 Jul 2017 20:30:25 +0200 + +rustc (1.18.0+dfsg1-2) experimental; urgency=medium + + * Update to latest Standards-Version; no changes required. + * Change rustc to Multi-Arch: allowed and update Build-Depends with :native + annotations. Multi-Arch: foreign is typically for arch-indep packages that + might need to satisfy dependency chains of different architectures. Also + update instructions on cross-compiling to match this newer situation. + * Build debugging symbols for non-libstd parts of rustc. + + -- Ximin Luo Mon, 17 Jul 2017 23:04:03 +0200 + +rustc (1.18.0+dfsg1-1) experimental; urgency=medium + + * New upstream release. + + -- Ximin Luo Tue, 27 Jun 2017 12:51:22 +0200 + +rustc (1.17.0+dfsg2-8) unstable; urgency=medium + + * Workaround for linux #865549, fix FTBFS on ppc64el. + + -- Ximin Luo Mon, 17 Jul 2017 13:41:59 +0200 + +rustc (1.17.0+dfsg2-7) unstable; urgency=medium + + * Show exception traceback in bootstrap.py to examine ppc64el build failure. + + -- Ximin Luo Wed, 21 Jun 2017 10:46:27 +0200 + +rustc (1.17.0+dfsg2-6) unstable; urgency=medium + + * Upload to unstable. + + -- Ximin Luo Wed, 21 Jun 2017 00:24:22 +0200 + +rustc (1.17.0+dfsg2-5) experimental; urgency=medium + + * More work-arounds for armhf test failures. + + -- Ximin Luo Fri, 16 Jun 2017 13:27:45 +0200 + +rustc (1.17.0+dfsg2-4) experimental; urgency=medium + + * Fix arch-indep and arch-dep tests. + * Bump the LLVM requirement to fix FTBFS on armhf. + + -- Ximin Luo Wed, 14 Jun 2017 21:37:16 +0200 + +rustc (1.17.0+dfsg2-3) experimental; urgency=medium + + * Try to force the real gdb package. Some resolvers like aspcud will select + gdb-minimal under some circumstances, but this causes the debuginfo-gdb + tests to break. + + -- Ximin Luo Wed, 14 Jun 2017 00:48:37 +0200 + +rustc (1.17.0+dfsg2-2) experimental; urgency=medium + + * Support and document cross-compiling of rustc itself. + * Document cross-compiling other rust packages such as cargo. + * Work around upstream #39015 by disabling those tests rather than by + disabling optimisation, which causes FTBFS on 1.17.0 ppc64el. See + upstream #42476 and #42532 for details. + + -- Ximin Luo Tue, 13 Jun 2017 21:13:31 +0200 + +rustc (1.17.0+dfsg2-1) experimental; urgency=medium + + [ Sylvestre Ledru ] + * New upstream release + + [ Ximin Luo ] + * Adapt packaging for rustbuild, the new upstream cargo-based build system. + + [ Matthijs van Otterdijk ] + * Add a binary package, rust-src. (Closes: #846177) + * Link to local Debian web resources in the docs, instead of remote ones. + + -- Ximin Luo Tue, 16 May 2017 18:00:53 +0200 + +rustc (1.16.0+dfsg1-1) unstable; urgency=medium + + * Upload to unstable so we have something to build 1.17 with. + * Update u-ignoretest-powerpc.patch for 1.16. + + -- Ximin Luo Wed, 19 Apr 2017 22:47:18 +0200 + +rustc (1.16.0+dfsg1-1~exp2) experimental; urgency=medium + + * Don't ignore test failures on Debian unstable. + * Re-fix ignoring armhf test, accidentally reverted in previous version. + * Try to fix buildd failure by swapping B-D alternatives. + + -- Ximin Luo Sun, 16 Apr 2017 15:05:47 +0200 + +rustc (1.16.0+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + * u-ignoretest-jemalloc.patch removed (applied upstream) + + [ Matthias Klose ] + * Bootstrap using the rustc version in the archive, on all architectures. + * Work around a GCC 4.8 ICE on AArch64. + * Use alternative build dependencies on cmake3 and binutils-2.26 for + builds on 14.04 LTS (trusty). + * debian/make_orig*dl_tarball.sh: Include all Ubuntu architectures. + * debian/rules: Ignore test results for now. + + -- Sylvestre Ledru Thu, 13 Apr 2017 15:24:03 +0200 + +rustc (1.15.1+dfsg1-1) unstable; urgency=medium + + * Upload to unstable so we have something to build 1.16 with. + * Try to fix ignoring atomic-lock-free tests on armhf. + + -- Ximin Luo Wed, 22 Mar 2017 00:13:27 +0100 + +rustc (1.15.1+dfsg1-1~exp3) experimental; urgency=medium + + * Ignore atomic-lock-free tests on armhf. + * Update ignoretest-armhf_03.patch for newer 1.15.1 behaviour. + * Tidy up some other patches to do with ignoring tests. + + -- Ximin Luo Sun, 12 Mar 2017 04:15:33 +0100 + +rustc (1.15.1+dfsg1-1~exp2) experimental; urgency=medium + + * Update armhf ignoretest patch. + * Bootstrap armhf. (Closes: #809316, #834003) + * Bootstrap ppc4el. (Closes: #839643) + * Fix rust-lldb symlink. (Closes: #850639) + + -- Ximin Luo Thu, 02 Mar 2017 23:01:26 +0100 + +rustc (1.15.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release (won't probably be in stretch). + see the 1.4 git branch for the follow up for stable + * Call to the test renamed from check-notidy => check + * d/p/u-destdir-support.diff: Apply upstream patch to support + destdir in the make install (for rustbuild, in later versions) + * Overrides the 'binary-or-shlib-defines-rpath' lintian warnings. + We need them for now + * Refresh of the patches + + [ Sven Joachim ] + * Drop Pre-Depends on multiarch-support. (Closes: #856109) + + [ Erwan Prioul ] + * Fix test and build failures for ppc64el. (Closes: #839643) + + [ Ximin Luo ] + * Disable rustbuild for the time being (as it was in 1.14) and instead + bootstrap two new arches, armhf and ppc64el. + * Switch back to debhelper 9 to make backporting easier. + * Switch Build-Depends on binutils-multiarch back to binutils, the former is + no longer needed by the upstream tests. + + [ Matthias Klose ] + * Compatibility fixes and improvements to help work better on Ubuntu. + + -- Sylvestre Ledru Sun, 26 Feb 2017 21:12:27 +0100 + +rustc (1.14.0+dfsg1-3) unstable; urgency=medium + + * Fix mips64 Makefile patches. + * Don't run arch-dep tests in a arch-indep build. + + -- Ximin Luo Wed, 04 Jan 2017 21:34:56 +0100 + +rustc (1.14.0+dfsg1-2) unstable; urgency=medium + + * Update README.Debian, the old one was way out of date. + * Detect mips CPUs in ./configure and fill in mips Makefile rules. + * Work around jemalloc-related problems in the upstream bootstrapping + binaries for arm64, ppc64el, s390x. + * Disable jemalloc on s390x - upstream already disable it for some other + arches. + * Disable jemalloc tests for arches where jemalloc is disabled. + * We still expect the following failures: + * arm64 should be fixed (i.e. no failures) compared to the previous upload. + * armhf will FTBFS due to 'Illegal instruction' and this can only be fixed + with the next stable rustc release. + * mips mipsel mips64el ppc64 ppc64el s390x will FTBFS due to yet other + test failures beyond the ones I fixed above; this upload is only to save + me manual work in producing nice reports that exhibit these failures. + + -- Ximin Luo Thu, 29 Dec 2016 23:00:47 +0100 + +rustc (1.14.0+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * New upstream release + * Update debian/watch + + [ Ximin Luo ] + * Try to bootstrap armhf ppc64 ppc64el s390x mips mipsel mips64el. + (Closes: #809316, #834003, #839643) + * Make rust-gdb and rust-lldb arch:all packages. + * Switch to debhelper 10. + + -- Ximin Luo Sat, 24 Dec 2016 18:03:03 +0100 + +rustc (1.13.0+dfsg1-2) unstable; urgency=high + + * Skip macro-stepping test on arm64, until + https://github.com/rust-lang/rust/issues/37225 is resolved. + + -- Luca Bruno Sat, 26 Nov 2016 23:40:14 +0000 + +rustc (1.13.0+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * New upstream release. + + [ Ximin Luo ] + * Use Debian system jquery instead of upstream's embedded copy. + + -- Sylvestre Ledru Fri, 11 Nov 2016 13:35:23 +0100 + +rustc (1.12.1+dfsg1-1) unstable; urgency=medium + + [ Sylvestre Ledru ] + * New (minor) upstream release + * Missing dependency from rust-lldb to python-lldb-3.8 (Closes: #841833) + * Switch to llvm 3.9. (Closes: #841834) + + [ Ximin Luo ] + * Dynamically apply rust-boot-1.12.1-from-1.12.0.diff. + This allows us to bootstrap from either 1.11.0 or 1.12.0. + * Bump LLVM Build-Depends version to get the backported patches for LLVM + #30402 and #29163. + * Install debugger_pretty_printers_common to rust-gdb and rust-lldb. + (Closes: #841835) + + -- Ximin Luo Mon, 07 Nov 2016 14:15:14 +0100 + +rustc (1.12.0+dfsg1-2) unstable; urgency=medium + + * Ignore test run-make/no-duplicate-libs. Fails on i386 + * Ignore test run-pass-valgrind/down-with-thread-dtors.rs . Fails on arm64 + * I am not switching to llvm 3.9 now because a test freezes. The plan is + to silent the warning breaking the build and upload 1.12.1 after + + -- Sylvestre Ledru Wed, 05 Oct 2016 10:48:01 +0200 + +rustc (1.12.0+dfsg1-1) unstable; urgency=medium + + * new upstream release + - Rebase of the patches and removal of deprecated patches + + -- Sylvestre Ledru Thu, 29 Sep 2016 20:45:04 +0200 + +rustc (1.11.0+dfsg1-3) unstable; urgency=medium + + * Fix separate build-arch and build-indep builds. + + -- Ximin Luo Tue, 13 Sep 2016 12:30:41 +0200 + +rustc (1.11.0+dfsg1-2) unstable; urgency=medium + + * Fix rebuilding against the current version, by backporting a patch I wrote + that was already applied upstream. Should fix the FTBFS that was observed + by tests.reproducible-builds.org. + * Ignore a failing stdcall test on arm64; should fix the FTBFS there. + * Backport a doctest fix I wrote, already applied upstream. + + -- Ximin Luo Mon, 12 Sep 2016 17:40:12 +0200 + +rustc (1.11.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + * Add versioned binutils dependency. (Closes: #819475, #823540) + + -- Ximin Luo Wed, 07 Sep 2016 10:31:57 +0200 + +rustc (1.10.0+dfsg1-3) unstable; urgency=medium + + * Rebuild with LLVM 3.8, same as what upstream are using + * Dynamically link against LLVM. (Closes: #832565) + + -- Ximin Luo Sat, 30 Jul 2016 22:36:41 +0200 + +rustc (1.10.0+dfsg1-2) unstable; urgency=medium + + * Tentatively support ARM architectures + * Include upstream arm64,armel,armhf stage0 compilers (i.e. 1.9.0 stable) + in a orig-dl tarball, like how we previously did for amd64,i386. + + -- Ximin Luo Fri, 22 Jul 2016 15:54:51 +0200 + +rustc (1.10.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + * Add myself to uploaders + * Update our build process to bootstrap from the previous Debian rustc stable + version by default. See README.Debian for other options. + * Update to latest Standards-Version; no changes required. + + -- Ximin Luo Sun, 17 Jul 2016 03:40:49 +0200 + +rustc (1.9.0+dfsg1-1) unstable; urgency=medium + + * New upstream release (Closes: #825752) + + -- Sylvestre Ledru Sun, 29 May 2016 17:57:38 +0200 + +rustc (1.8.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + + [ Ximin Luo ] + * Fix using XZ for the orig tarball: needs explicit --repack in debian/watch + * Drop wno-error patch; applied upstream. + + -- Sylvestre Ledru Fri, 15 Apr 2016 12:01:45 +0200 + +rustc (1.7.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Thu, 03 Mar 2016 22:41:24 +0100 + +rustc (1.6.0+dfsg1-3) unstable; urgency=medium + + * Apply upstream fix to silent a valgrind issue in the test suite + (Closes: ##812825) + * Add gcc & libc-dev as dependency of rustc to make sure it works + out of the box + + [ Ximin Luo ] + * Work around rust bug https://github.com/rust-lang/rust/issues/31529 + * Enable optional tests, and add verbosity/backtraces to tests + * Use XZ instead of GZ compression (will apply to the next new upload) + + -- Sylvestre Ledru Tue, 02 Feb 2016 15:08:11 +0100 + +rustc (1.6.0+dfsg1-2) unstable; urgency=medium + + * mk/rt.mk: Modify upstream code to append -Wno-error rather than trying + to remove the string "-Werror". (Closes: #812448) + * Disable new gcc-6 "-Wmisleading-indentation" warning, which triggers + (incorrectly) on src/rt/miniz.c. (Closes: #811573) + * Guard arch-dependent dh_install commands appropriately, fixing + arch-indep-only builds. (Closes: #809124) + + -- Angus Lees Tue, 26 Jan 2016 05:40:14 +1100 + +rustc (1.6.0+dfsg1-1) unstable; urgency=medium + + * new upstream release + + [ Ximin Luo ] + * Use secure links for Vcs-* fields. + + -- Sylvestre Ledru Fri, 22 Jan 2016 10:56:08 +0100 + +rustc (1.5.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + - We believe that we should let rust transit to testing + (Closes: #786836) + * Move away from hash to the same rust naming schema + + -- Sylvestre Ledru Thu, 10 Dec 2015 17:23:32 +0100 + +rustc (1.4.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + 198068b3 => 1bf6e69c + * Update the download url in debian/watch + + -- Sylvestre Ledru Fri, 30 Oct 2015 09:36:02 +0100 + +rustc (1.3.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + 62abc69f => 198068b3 + * jquery updated from 2.1.0 to 2.1.4 + + [ Ximin Luo ] + * Use LLVM 3.7 as upstream does, now that it's released. (Closes: #797626) + * Fix debian/copyright syntax mistakes. + * Don't Replace/Break previous versions of libstd-rust-* + * Check that the libstd-rust-* name in d/control matches upstream. + * Several other minor build tweaks. + + -- Sylvestre Ledru Sat, 19 Sep 2015 14:39:35 +0200 + +rustc (1.2.0+dfsg1-1) unstable; urgency=medium + + * New upstream release + libstd-rust-7d23ff90 => libstd-rust-62abc69f + * Add llvm-3.6-tools to the build dep as it is + now needed for tests + * Fix the Vcs-Browser value + + -- Sylvestre Ledru Sat, 08 Aug 2015 23:13:44 +0200 + +rustc (1.1.0+dfsg1-3) unstable; urgency=medium + + * rust-{gdb,lldb} now Replaces pre-split rustc package. + Closes: #793433. + * Several minor lintian cleanups. + + -- Angus Lees Fri, 24 Jul 2015 17:47:48 +1000 + +rustc (1.1.0+dfsg1-2) unstable; urgency=medium + + [ Angus Lees ] + * Replace remote Rust logo with local file in HTML docs. + * Symlink rust-{gdb,lldb}.1 to {gdb,lldb}.1 manpages. + Note that gdb.1 requires the gdb-doc package, and that lldb.1 doesn't + exist yet (see #792908). + * Restore "Architecture: amd64 i386" filter, mistakenly removed in + previous version. Unfortunately the toolchain bootstrap isn't ready + to support all Debian archs yet. Closes: #793147. + + -- Angus Lees Wed, 22 Jul 2015 09:51:08 +1000 + +rustc (1.1.0+dfsg1-1) unstable; urgency=low + + [ Angus Lees ] + * Set SONAME when building dylibs + * Split out libstd-rust, libstd-rust-dev, rust-gdb, rust-lldb from rustc + - libs are now installed into multiarch-friendly locations + - rpath is no longer required to use dylibs (but talk to Debian Rust + maintainers before building a package that depends on the dylibs) + * Install /usr/share/rustc/architecture.mk, which declares Rust arch + triples for Debian archs and is intended to help future Rust packaging + efforts. Warning: it may not be complete/accurate yet. + * New upstream release (1.1) + + -- Angus Lees Thu, 16 Jul 2015 14:23:47 +1000 + +rustc (1.0.0+dfsg1-1) unstable; urgency=medium + + [ Angus Lees ] + * New upstream release (1.0!) + + [ Sylvestre Ledru ] + * Fix the watch file + * Update of the repack to remove llvm sources + + -- Sylvestre Ledru Sat, 16 May 2015 08:24:32 +1000 + +rustc (1.0.0~beta.4-1~exp1) experimental; urgency=low + + [ Angus Lees ] + * New upstream release (beta 3) + - Drop manpage patch - now included upstream + * Replace duplicated compile-time dylibs with symlinks to run-time libs + (reduces installed size by ~68MB) + + [ Sylvestre Ledru ] + * New upstream release (beta 4) + * Replace two more occurrences of jquery by the package + * Repack upstream to remove an LLVM file with a non-DFSG license + + -- Sylvestre Ledru Wed, 06 May 2015 11:14:30 +0200 + +rustc (1.0.0~alpha.2-1~exp1) experimental; urgency=low + + [ Angus Lees ] + * Patch upstream manpages to address minor troff issues + * Make 'debian/rules clean' also clean LLVM source + * Rename primary 'rust' binary package to 'rustc' + * Fix potential FTBFS: rust-doc requires texlive-fonts-recommended (for + pzdr.tfm) + * Build against system LLVM + + [ Sylvestre Ledru ] + * New testing release + * Renaming of the source package + * Set a minimal version for dpkg-dev and debhelper (for profiles) + * For now, disable build profiles as they are not supported in Debian + * Introduce some changes by Angus Lees + - Introduction of build stages + - Disable the parallel execution of tests + - Improving of the parallel syntax + - Use override_dh_auto_build-arch + - Use override_dh_auto_build-indep + - Better declarations of the doc + - Update of the description + - Watch file updated (with key check) + + [ Luca Bruno ] + * rules: respect 'nocheck' DEB_BUILD_OPTIONS + + -- Sylvestre Ledru Sat, 07 Mar 2015 09:25:47 +0100 + +rust (1.0.0~alpha-0~exp1) experimental; urgency=low + + * Initial package (Closes: #689207) + Work done by Luca Bruno, Jordan Justen and Sylvestre Ledru + + -- Sylvestre Ledru Fri, 23 Jan 2015 15:47:37 +0100 diff --git a/compat b/compat new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/config.toml.in b/config.toml.in new file mode 100644 index 0000000000..7ea5ac382b --- /dev/null +++ b/config.toml.in @@ -0,0 +1,39 @@ +[build] +submodules = false +vendor = true +locked-deps = false + +build = "DEB_BUILD_RUST_TYPE" +host = ["DEB_HOST_RUST_TYPE"] +target = ["DEB_TARGET_RUST_TYPE"] + +docs = false + +[install] +prefix = "/usr" + +[target.DEB_BUILD_RUST_TYPE] +llvm-config = "/usr/lib/llvm-3.9/bin/llvm-config" + +ifelse(DEB_BUILD_RUST_TYPE,DEB_HOST_RUST_TYPE,, +[target.DEB_HOST_RUST_TYPE] +llvm-config = "/usr/lib/llvm-3.9/bin/llvm-config" + +)dnl +ifelse(DEB_BUILD_RUST_TYPE,DEB_TARGET_RUST_TYPE,,DEB_HOST_RUST_TYPE,DEB_TARGET_RUST_TYPE,, +[target.DEB_TARGET_RUST_TYPE] +llvm-config = "/usr/lib/llvm-3.9/bin/llvm-config" + +)dnl +[llvm] +link-shared = true + +[rust] +dist-src = false + +channel = "RELEASE_CHANNEL" + +codegen-units = 0 +debuginfo = true +debuginfo-lines = true +rpath = false diff --git a/control b/control new file mode 100644 index 0000000000..4b2f2dff6e --- /dev/null +++ b/control @@ -0,0 +1,198 @@ +Source: rustc +Section: devel +Priority: extra +Maintainer: Rust Maintainers +Uploaders: Jordan Justen , + Luca Bruno , + Sylvestre Ledru , + Angus Lees , + Ximin Luo +Build-Depends: debhelper (>= 9), + dpkg-dev (>= 1.17.14), + python:native, +# TODO: related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839145 +# the non-native lines can be deleted after all versions in unstable are M-A: allowed + cargo (>= 0.17.0) | + cargo:native (>= 0.17.0) , + rustc (>= 1.17.0+dfsg) | + rustc:native (>= 1.17.0+dfsg) , + rustc (<= 1.18.0++) | + rustc:native (<= 1.18.0++) , + llvm-3.9-dev:native (>= 1:3.9.1-10~), + llvm-3.9-tools:native (>= 1:3.9.1-10~), + libllvm3.9 (>= 1:3.9.1-10~), + autotools-dev, + cmake | cmake3, + gperf, +# this is sometimes needed depending on the LLVM situation, just keep it here + zlib1g-dev, + binutils (>= 2.26) | binutils-2.26 , + nodejs , + valgrind , + git , + procps , +# the tests require the docs to be built, which requires jquery + libjs-jquery , +# below are optional tools even for 'make check' + antlr4 | antlr , + bison , + flex , + gdb (>= 7.12) , + default-jdk-headless | default-jdk , +Build-Depends-Indep: libjs-jquery +# Work around #864741. The version constraint for gdb above should already do +# that, but this will keep things covered even in the case that they change +# gdb-minimal to do a versioned Provides: gdb. +Build-Conflicts: gdb-minimal +Standards-Version: 4.0.0 +Homepage: http://www.rust-lang.org/ +Vcs-Git: https://anonscm.debian.org/git/pkg-rust/rust.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-rust/rust.git + +Package: rustc +Architecture: any +Multi-Arch: allowed +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version}), + gcc, libc-dev, libjs-jquery, binutils (>= 2.26) +Recommends: rust-gdb | rust-lldb +Suggests: rust-doc, rust-src +Description: Rust systems programming language + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + +Package: libstd-rust-1.18 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Rust standard libraries + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains the standard Rust libraries, built as dylibs. + +Package: libstd-rust-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, libstd-rust-1.18 (= ${binary:Version}) +Description: Rust standard libraries - development files + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains development files necessary to use the standard + Rust libraries. + +Package: rust-gdb +Architecture: all +Depends: gdb, ${misc:Depends} +Suggests: gdb-doc +Replaces: rustc (<< 1.1.0+dfsg1-1) +Description: Rust debugger (gdb) + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains pretty printers and a wrapper script for + invoking gdb on rust binaries. + +Package: rust-lldb +Architecture: all +# When updating, also update rust-lldb.links +Depends: lldb-3.9, ${misc:Depends}, python-lldb-3.9 +Replaces: rustc (<< 1.1.0+dfsg1-1) +Description: Rust debugger (lldb) + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains pretty printers and a wrapper script for + invoking lldb on rust binaries. + +Package: rust-doc +Section: doc +Architecture: all +Build-Profiles: +Depends: ${misc:Depends}, + libjs-jquery, libjs-highlight.js, libjs-mathjax, + fonts-open-sans, fonts-font-awesome +Description: Rust systems programming language - Documentation + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains the Rust tutorial, language reference and + standard library documentation. + +Package: rust-src +Section: devel +Architecture: all +Depends: ${misc:Depends} +Description: Rust systems programming language - source code + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains sources of the Rust compiler and standard + libraries, useful for IDEs and code analysis tools such as Racer. diff --git a/copyright b/copyright new file mode 100644 index 0000000000..8684e3a183 --- /dev/null +++ b/copyright @@ -0,0 +1,960 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rust +Source: https://www.rust-lang.org +Files-Excluded: + *.min.js + cargo + src/jemalloc/msvc/*_vc*.sln + src/llvm + src/rt/hoedown/src/html_blocks.c + src/vendor/mdbook/src/theme/_FontAwesome + src/vendor/mdbook/src/theme/highlight.js + src/vendor/mdbook/src/theme/highlight.css + +# Use crate-copyright.py to help you update this file quickly + +Files: C*.md + R*.md + COPYRIGHT + LICENSE* + configure + man/* + rls/* + src/Cargo.* + src/bootstrap/* + src/build_helper/* + src/ci/* + src/doc/* + src/driver/* + src/etc/* + src/grammar/* + src/lib* + src/rt* + src/rust* + src/stage0.txt + src/tools/* + src/test/* + version + x.py +Copyright: 2006-2009 Graydon Hoare + 2009-2012 Mozilla Foundation + 2012-2017 The Rust Project Developers (see AUTHORS.txt) +License: Expat or Apache-2.0 + +Files: src/librustc_trans/cabi_x86_64.rs +Copyright: 2008-2010 Tachyon Technologies +License: BSD-2-clause + +Files: src/rt/miniz.c +Copyright: 1996-2012 Rich Geldreich +License: Unlicense + +Files: src/jemalloc/* +Copyright: 2002-2014 Jason Evans + 2007-2012 Mozilla Foundation + 2009-2014 Facebook, Inc. +License: BSD-2-clause + +Files: src/jemalloc/bin/jeprof.in +Copyright: 1998-2007, Google Inc. +License: BSD-3-Clause + +Files: src/compiler-rt/* +Copyright: 2009-2015 Howard Hinnant + 2009-2015 The CompileRT Developers (see src/compiler-rt/CREDITS.TXT) +License: BSD-3-clause or Expat + +Files: src/compiler-rt/lib/BlocksRuntime/* +Copyright: 2008-2010 Apple, Inc. +License: Expat + +Files: src/rt/hoedown/* +Copyright: 2008 Natacha Porté + 2011 Vicent Martí + 2013 Devin Torres and the Hoedown authors +License: ISC + +Files: src/libbacktrace/* +Copyright: 2012-2014 Free Software Foundation, Inc. + (written by Ian Lance Taylor, Google.) +License: BSD-3-Clause + +Files: + src/libbacktrace/filenames.h + src/libbacktrace/ansidecl.h + src/libbacktrace/hashtab.h + src/libbacktrace/ltmain.sh +Copyright: 2000, 2001, 2007, 2010 Free Software Foundation, Inc. +License: GPL-2+ + +Files: src/libbacktrace/dwarf2.h +Copyright: 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002, + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. +License: GPL-3+ with GCC Runtime Library exception + +Files: src/librustdoc/html/static/FiraSans* +Copyright: 2014, Mozilla Foundation, 2014, Telefonica S.A. +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/Heuristica* +Copyright: 1989, 1991 Adobe Systems Incorporated, + 2006 Han The Thanh, Vntopia font family, + 2008-2012, Andrey V. Panov +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/SourceCodePro* +Copyright: 2010, 2012 Adobe Systems Incorporated +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/SourceSerifPro* +Copyright: 2014 Adobe Systems Incorporated +License: SIL-OPEN-FONT + +Files: src/librustdoc/html/static/main.js +Copyright: 2014 The Rust Project Developers +License: Expat or Apache-2.0 + +Files: src/libstd/memchr.rs +Copyright: 2015 Andrew Gallant, bluss and Nicolas Koch +License: Expat or Apache-2.0 + +Files: src/libstd/sync/mpsc/mpsc_queue.rs + src/libstd/sync/mpsc/spsc_queue.rs +Copyright: 2010-2011 Dmitry Vyukov +License: BSD-2-Clause + +Files: src/vendor/bitflags/* + src/vendor/bitflags-* + src/vendor/cmake/* + src/vendor/env_logger/* + src/vendor/env_logger-* + src/vendor/getopts/* + src/vendor/gcc/* + src/vendor/libc/* + src/vendor/log/* + src/vendor/num-traits/* + src/vendor/regex/* + src/vendor/regex-syntax/* + src/vendor/rustc-serialize/* +Copyright: 2014-2017 The Rust Project Developers +License: Expat or Apache-2.0 +Comment: + This is a collection of external crates embedded here to bootstrap cargo. + Most of them come from the original upstream Rust project, thus share the + same MIT/Apache-2.0 dual-license. See https://github.com/rust-lang. + Exceptions are noted below. + +Files: src/vendor/filetime/* + src/vendor/toml/* + src/vendor/toml-0* +Copyright: 2014-2016 Alex Crichton +License: Expat or Apache-2.0 +Comment: see https://github.com/alexcrichton/ + +Files: src/vendor/ansi_term/* +Copyright: 2014-2016 ogham@bsago.me + 2014-2016 Ryan Scheel (Havvy) +License: Expat +Comment: see https://github.com/ogham/rust-ansi-term + +Files: src/vendor/aho-corasick/* + src/vendor/memchr/* + src/vendor/utf8-ranges/* +Copyright: 2015 Andrew Gallant +License: Expat or Unlicense +Comment: see upstream projects, + * https://github.com/docopt/docopt.rs + * https://github.com/BurntSushi/aho-corasick + * https://github.com/BurntSushi/rust-memchr + * https://github.com/BurntSushi/utf8-ranges + +Files: src/vendor/atty/* +Copyright: 2015-2017 softprops +License: Expat +Comment: see https://github.com/softprops/atty + +Files: src/vendor/clap/* +Copyright: 2015-2017 Kevin K. +License: Expat +Comment: see https://github.com/kbknapp/clap-rs.git + +Files: src/vendor/dtoa/* + src/vendor/itoa/* +Copyright: 2016-2017 David Tolnay +License: Expat or Apache-2.0 +Comment: + see https://github.com/dtolnay/dtoa + see https://github.com/dtolnay/itoa + +Files: src/vendor/handlebars/* +Copyright: 2014-2017 Ning Sun +License: Expat +Comment: see https://github.com/sunng87/handlebars-rust + +Files: src/vendor/kernel32-sys/* + src/vendor/winapi/* + src/vendor/winapi-build/* +Copyright: 2015-2017 Peter Atashian + 2015-2017 winapi-rs developers +License: Expat +Comment: see https://github.com/retep998/winapi-rs + +Files: src/vendor/lazy_static/* +Copyright: 2014-2016 Marvin Löbel +License: Expat +Comment: see https://github.com/rust-lang-nursery/lazy-static.rs + +Files: src/vendor/mdbook/* +Copyright: 2015-2017 Mathieu David +License: MPL-2.0 +Comment: see https://github.com/azerupi/mdBook + +Files: src/vendor/num_cpus/* +Copyright: 2015 Sean McArthur +License: Expat +Comment: see https://github.com/seanmonstar/num_cpus + +Files: src/vendor/open/* +Copyright: 2015-2017 Sebastian Thiel +License: Expat +Comment: see https://github.com/Byron/open-rs + +Files: src/vendor/pest/* +Copyright: 2016-2017 Dragoș Tiselice +License: MPL-2.0 +Comment: see https://github.com/dragostis/pest + +Files: src/vendor/pulldown-cmark/* + src/vendor/pulldown-cmark-* +Copyright: 2015-2017 Raph Levien +License: Expat +Comment: see https://github.com/google/pulldown-cmark + +Files: src/vendor/quick-error/* +Copyright: 2015-2017 Paul Colomiets + 2015-2017 Colin Kiegel +License: Expat or Apache-2.0 +Comment: see http://github.com/tailhook/quick-error + +Files: src/vendor/rls-data/* + src/vendor/rls-span/* +Copyright: 2016-2017 Nick Cameron +License: Apache-2.0 or Expat +Comment: see https://github.com/nrc/rls-span + see https://github.com/nrc/rls-data + +Files: src/vendor/serde/* + src/vendor/serde_json/* +Copyright: 2014-2017 Erick Tryzelaar +License: Expat or Apache-2.0 +Comment: + see https://github.com/serde-rs/serde + see https://github.com/serde-rs/json + +Files: src/vendor/strsim/* +Copyright: 2015 Danny Guo +License: Expat +Comment: see https://github.com/dguo/strsim-rs + +Files: src/vendor/term_size/* +Copyright: 2016-2017 Kevin K. + 2016-2017 Benjamin Sago +License: Expat or Apache-2.0 +Comment: see https://github.com/kbknapp/term_size-rs.git + +Files: src/vendor/thread-id/* +Copyright: 2016 Ruud van Asseldonk +License: Apache-2.0 +Comment: see https://github.com/ruud-v-a/thread-id + +Files: src/vendor/thread_local/* +Copyright: 2016 Amanieu d'Antras +License: Expat or Apache-2.0 +Comment: see https://github.com/Amanieu/thread_local-rs + +Files: src/vendor/unicode-segmentation/* + src/vendor/unicode-width/* +Copyright: 2015-2017 kwantam +License: Expat or Apache-2.0 +Comment: + see https://github.com/unicode-rs/unicode-segmentation + see https://github.com/unicode-rs/unicode-width + +Files: src/vendor/vec_map/* +Copyright: 2015-2017 Alexis Beingessner + 2015-2017 Andrew Paseltiner + 2015-2017 contain-rs developers + 2015-2017 The Rust Project Developers +License: Expat or Apache-2.0 +Comment: see https://github.com/contain-rs/vec-map + +Files: src/vendor/unreachable/* + src/vendor/void/* +Copyright: 2015-2017 Jonathan Reem +License: Expat +Comment: + see https://github.com/reem/rust-unreachable.git + see https://github.com/reem/rust-void.git + +Files: debian/* +Copyright: 2013-2017 Debian Rust Maintainers +License: Expat or Apache-2.0 + +Files: debian/icons/rust-logo-32x32-blk.png +Copyright: Mozilla Foundation +License: CC-BY +Comment: + Relevant discussion in https://github.com/rust-lang/rust/issues/11562 + +License: Apache-2.0 + On Debian systems, the full text of the Apache License + Version 2.0 can be found in the file + `/usr/share/common-licenses/Apache-2.0'. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with + or without modification, are permitted provided that the + following conditions are met: + . + 1. Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + 2. Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or + other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: Expat + Permission is hereby granted, free of charge, to any + person obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the + Software without restriction, including without + limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software + is furnished to do so, subject to the following + conditions: + . + The above copyright notice and this permission notice + shall be included in all copies or substantial portions + of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED + TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the organization nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: Unlicense + This is free and unencumbered software released into the public domain. + . + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + . + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the + benefit of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + For more information, please refer to + +License: SIL-OPEN-FONT + This Font Software is licensed under the SIL Open Font License, + Version 1.1. + . + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL + . + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + . + PREAMBLE The goals of the Open Font License (OFL) are to stimulate + worldwide development of collaborative font projects, to support the font + creation efforts of academic and linguistic communities, and to provide + a free and open framework in which fonts may be shared and improved in + partnership with others. + . + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. + The fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply to + any document created using the fonts or their derivatives. + . + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. + This may include source files, build scripts and documentation. + . + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + . + "Original Version" refers to the collection of Font Software components + as distributed by the Copyright Holder(s). + . + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting ? in part or in whole ? + any of the components of the Original Version, by changing formats or + by porting the Font Software to a new environment. + . + "Author" refers to any designer, engineer, programmer, technical writer + or other person who contributed to the Font Software. + . + PERMISSION & CONDITIONS + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + . + 1) Neither the Font Software nor any of its individual components,in + Original or Modified Versions, may be sold by itself. + . + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + . + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + . + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + 5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + . + TERMINATION + This license becomes null and void if any of the above conditions are not met. + . + DISCLAIMER + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, see /usr/share/common-licenses/GPL-2 for the full + text of the GPL version 2. + +License: GPL-3+ with GCC Runtime Library exception + GCC is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 3, or (at your option) any later + version. + . + GCC is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + . + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + . + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . + +License: CC-BY + Attribution 4.0 International + . + ======================================================================= + . + Creative Commons Corporation ("Creative Commons") is not a law firm and + does not provide legal services or legal advice. Distribution of + Creative Commons public licenses does not create a lawyer-client or + other relationship. Creative Commons makes its licenses and related + information available on an "as-is" basis. Creative Commons gives no + warranties regarding its licenses, any material licensed under their + terms and conditions, or any related information. Creative Commons + disclaims all liability for damages resulting from their use to the + fullest extent possible. + . + Using Creative Commons Public Licenses + . + Creative Commons public licenses provide a standard set of terms and + conditions that creators and other rights holders may use to share + original works of authorship and other material subject to copyright + and certain other rights specified in the public license below. The + following considerations are for informational purposes only, are not + exhaustive, and do not form part of our licenses. + . + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + . + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + . + ======================================================================= + . + Creative Commons Attribution 4.0 International Public License + . + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution 4.0 International Public License ("Public License"). To the + extent this Public License may be interpreted as a contract, You are + granted the Licensed Rights in consideration of Your acceptance of + these terms and conditions, and the Licensor grants You such rights in + consideration of benefits the Licensor receives from making the + Licensed Material available under these terms and conditions. + . + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + . + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + . + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + . + . + ======================================================================= + . + Creative Commons is not a party to its public licenses. + Notwithstanding, Creative Commons may elect to apply one of its public + licenses to material it publishes and in those instances will be + considered the "Licensor." Except for the limited purpose of indicating + that material is shared under a Creative Commons public license or as + otherwise permitted by the Creative Commons policies published at + creativecommons.org/policies, Creative Commons does not authorize the + use of the trademark "Creative Commons" or any other trademark or logo + of Creative Commons without its prior written consent including, + without limitation, in connection with any unauthorized modifications + to any of its public licenses or any other arrangements, + understandings, or agreements concerning use of licensed material. For + the avoidance of doubt, this paragraph does not form part of the public + licenses. + . + Creative Commons may be contacted at creativecommons.org. + +License: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + . + On Debian systems, see /usr/share/common-licenses/MPL-2.0 for the full + text of the MPL version 2.0. diff --git a/crate-copyright.py b/crate-copyright.py new file mode 100644 index 0000000000..86b49b6d5a --- /dev/null +++ b/crate-copyright.py @@ -0,0 +1,38 @@ +#!/bin/python3 + +import datetime +import pytoml +import os +import subprocess +import sys + +this_year = datetime.datetime.now().year +crates = sys.argv[1:] +get_initial_commit = len(crates) == 1 + +for crate in crates: + with open(os.path.join(crate, "Cargo.toml")) as fp: + data = pytoml.load(fp) + repo = data["package"].get("repository", None) + if get_initial_commit and repo: + output = subprocess.check_output( + """git clone --bare "%s" tmp.crate-copyright >&2 && +cd tmp.crate-copyright && +git log --format=%%cI --reverse | head -n1 | cut -b1-4 && +git log --format=%%cI | head -n1 | cut -b1-4 && +cd .. && +rm -rf tmp.crate-copyright""" % repo, shell=True).decode("utf-8") + first_year, last_year = output.strip().split(maxsplit=2) + else: + first_year = "20XX" + last_year = this_year + print("""Files: {0} +Copyright: {1} +License: {2} +Comment: see {3} +""".format( + os.path.join(crate, "*"), + "\n ".join("%s-%s %s" % (first_year, last_year, a.replace(" <>", "")) for a in data ["package"]["authors"]), + data["package"].get("license", "???").replace("/", " or ").replace("MIT", "Expat"), + repo or "???" + )) diff --git a/docs b/docs new file mode 100644 index 0000000000..b43bf86b50 --- /dev/null +++ b/docs @@ -0,0 +1 @@ +README.md diff --git a/ensure-patch b/ensure-patch new file mode 100755 index 0000000000..b8562f2d93 --- /dev/null +++ b/ensure-patch @@ -0,0 +1,15 @@ +#!/bin/sh +set -e + +case "$1" in +"-N") fwd=-N; rev=-R; verb="applied";; +"-R") fwd=-R; rev=-N; verb="reversed";; +*) echo >&2 "Usage: $0 <-N|-R> "; exit 2;; +esac + +if patch --dry-run -F0 -f $rev -p1 < "$2" >/dev/null; then + echo >&2 "patch already $verb: $2" + exit 0 +fi +patch --dry-run -F0 -f $fwd -p1 < "$2" +patch -F0 -f $fwd -p1 < "$2" diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000000..4e97aad886 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +ignore-branch = True diff --git a/get-stage0.py b/get-stage0.py new file mode 100755 index 0000000000..655261115c --- /dev/null +++ b/get-stage0.py @@ -0,0 +1,24 @@ +#!/usr/bin/python + +import sys + +import bootstrap +from bootstrap import RustBuild + +class DownloadOnlyRustBuild(RustBuild): + triple = None + def build_bootstrap(self): + pass + def run(self, *args): + pass + def build_triple(self): + return self.triple + +def main(argv): + triple = argv.pop(1) + DownloadOnlyRustBuild.triple = triple + bootstrap.RustBuild = DownloadOnlyRustBuild + bootstrap.bootstrap() + +if __name__ == '__main__': + main(sys.argv) diff --git a/icons/rust-logo-32x32-blk.png b/icons/rust-logo-32x32-blk.png new file mode 100644 index 0000000000..9cc1452e37 Binary files /dev/null and b/icons/rust-logo-32x32-blk.png differ diff --git a/libstd-rust-1.18.lintian-overrides b/libstd-rust-1.18.lintian-overrides new file mode 100644 index 0000000000..08f17d283c --- /dev/null +++ b/libstd-rust-1.18.lintian-overrides @@ -0,0 +1,12 @@ +# "libstd" just seemed too generic +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: unused-shlib-entry-in-control-file + +# 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 diff --git a/libstd-rust-dev.install b/libstd-rust-dev.install new file mode 100644 index 0000000000..62eeb7ebeb --- /dev/null +++ b/libstd-rust-dev.install @@ -0,0 +1 @@ +usr/lib/rustlib/*/lib/ diff --git a/libstd-rust-dev.lintian-overrides b/libstd-rust-dev.lintian-overrides new file mode 100644 index 0000000000..61b3c11c48 --- /dev/null +++ b/libstd-rust-dev.lintian-overrides @@ -0,0 +1,3 @@ +# I assure you, dear lintian, that "/usr/lib/rustlib/x86_64-unknown-linux-gnu/" +# is indeed an arch-specific directory. +libstd-rust-dev binary: arch-dependent-file-not-in-arch-specific-directory diff --git a/make_orig-stage0_tarball.sh b/make_orig-stage0_tarball.sh new file mode 100755 index 0000000000..6e34944e32 --- /dev/null +++ b/make_orig-stage0_tarball.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# See README.Debian "Bootstrapping" for details. +# +# You may want to use `debian/rules source_orig-stage0` instead of calling this +# directly. + +set -e + +upstream_version="$(dpkg-parsechangelog -SVersion | sed -e 's/\(.*\)-.*/\1/g')" +upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armel armhf i386 powerpc ppc64el s390x}" + +rm -f stage0/*/*.sha256 +mkdir build && ln -sf ../stage0 build/cache +for deb_host_arch in $upstream_bootstrap_arch; do + make -s --no-print-directory -f debian/architecture-test.mk "rust-for-deb_${deb_host_arch}" | { + read deb_host_arch rust_triplet + PYTHONPATH=src/bootstrap debian/get-stage0.py "${rust_triplet}" + rm -rf "${rust_triplet}" + } +done + +tar --mtime=@"${SOURCE_DATE_EPOCH:-$(date +%s)}" --clamp-mtime \ + --owner=root --group=root \ + -cJf "../rustc_${upstream_version}.orig-stage0.tar.xz" \ + --transform "s/^stage0\///" \ + stage0/* + +rm -f src/bootstrap/bootstrap.pyc + +cat < + libfoo-1.2.3.so" symlink common with C/C++ when building with Rust, + and no need to communicate an alternate filename to use at run-time + vs compile time. If linking to a Rust dylib from C/C++ however, a + "libfoo.so -> libfoo-$hash.so" symlink may well be useful and in + this case DT_SONAME=libfoo-$hash.so would be required. More + mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't + find DT_SONAME on shared libraries in public directories. + . + This patch passes -Wl,-soname=$outfile when building dylibs (and + using a GNU linker). +Author: Angus Lees +Forwarded: no + +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -998,6 +998,13 @@ + cmd.args(&rpath::get_rpath_flags(&mut rpath_config)); + } + ++ if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib) ++ && t.options.linker_is_gnu { ++ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); ++ let soname = [String::from("-Wl,-soname=") + &filename]; ++ cmd.args(&soname); ++ } ++ + // Finally add all the linker arguments provided on the command line along + // with any #[link_args] attributes found inside the crate + if let Some(ref args) = sess.opts.cg.link_args { diff --git a/patches/d-cross-compile-install.patch b/patches/d-cross-compile-install.patch new file mode 100644 index 0000000000..48b48a0b8a --- /dev/null +++ b/patches/d-cross-compile-install.patch @@ -0,0 +1,28 @@ +Description: Force "install" to use DEB_HOST_RUST_TYPE + This is needed to get cross-build working correctly +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/42320 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/bootstrap/step.rs ++++ b/src/bootstrap/step.rs +@@ -960,11 +960,18 @@ + + impl<'a> Rules<'a> { + fn new(build: &'a Build) -> Rules<'a> { ++ let target_env = ::std::env::var("DEB_HOST_RUST_TYPE").unwrap(); ++ // rust forces us to do this dance because of lifetimes :/ ++ let hosts = &build.config.host; ++ let target = match hosts.iter().position(|x| x == target_env.as_str()) { ++ None => &build.config.build, ++ Some(tidx) => hosts[tidx].as_str() ++ }; + Rules { + build: build, + sbuild: Step { + stage: build.flags.stage.unwrap_or(2), +- target: &build.config.build, ++ target: target, + host: &build.config.build, + name: "", + }, diff --git a/patches/d-disable-cargo-vendor.patch b/patches/d-disable-cargo-vendor.patch new file mode 100644 index 0000000000..22baf34b65 --- /dev/null +++ b/patches/d-disable-cargo-vendor.patch @@ -0,0 +1,18 @@ +Description: Don't check for cargo-vendor when building from (Debian's) git +Author: Matthijs van Otterdijk +Forwarded: not-needed +--- +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -434,7 +434,10 @@ + } + + // If we're building from git sources, we need to vendor a complete distribution. +- if build.src_is_git { ++ // ++ // Debian: disabling this block because the debian package is also in a git ++ // repository, but cargo-vendor should not be installed or run. ++ if false && build.src_is_git { + // Get cargo-vendor installed, if it isn't already. + let mut has_cargo_vendor = false; + let mut cmd = Command::new(&build.cargo); diff --git a/patches/d-dont-download-stage0.patch b/patches/d-dont-download-stage0.patch new file mode 100644 index 0000000000..e495f47d30 --- /dev/null +++ b/patches/d-dont-download-stage0.patch @@ -0,0 +1,79 @@ +Description: Don't download SHA256 if it's already available locally + In Debian we provide the stage0 tarballs as a separate component so that the + buildds don't need to access the network during the build. +Author: Ximin Luo +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -23,15 +23,17 @@ + from time import time + + +-def get(url, path, verbose=False): ++def get(url, path, verbose=False, use_local_hash_if_present=True): + sha_url = url + ".sha256" + with tempfile.NamedTemporaryFile(delete=False) as temp_file: + temp_path = temp_file.name +- with tempfile.NamedTemporaryFile(suffix=".sha256", delete=False) as sha_file: +- sha_path = sha_file.name ++ sha_path = path + ".sha256" + + try: +- download(sha_path, sha_url, False, verbose) ++ if use_local_hash_if_present and os.path.exists(sha_path): ++ print("using already-download file " + sha_path) ++ else: ++ download(sha_path, sha_url, False, verbose) + if os.path.exists(path): + if verify(path, sha_path, False): + if verbose: +@@ -48,7 +50,6 @@ + print("moving {} to {}".format(temp_path, path)) + shutil.move(temp_path, path) + finally: +- delete_if_present(sha_path, verbose) + delete_if_present(temp_path, verbose) + + +@@ -173,8 +174,7 @@ + filename = "rust-std-{}-{}.tar.gz".format(channel, self.build) + url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date() + tarball = os.path.join(rustc_cache, filename) +- if not os.path.exists(tarball): +- get("{}/{}".format(url, filename), tarball, verbose=self.verbose) ++ get("{}/{}".format(url, filename), tarball, verbose=self.verbose) + unpack(tarball, self.bin_root(), + match="rust-std-" + self.build, + verbose=self.verbose) +@@ -182,8 +182,7 @@ + filename = "rustc-{}-{}.tar.gz".format(channel, self.build) + url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date() + tarball = os.path.join(rustc_cache, filename) +- if not os.path.exists(tarball): +- get("{}/{}".format(url, filename), tarball, verbose=self.verbose) ++ get("{}/{}".format(url, filename), tarball, verbose=self.verbose) + unpack(tarball, self.bin_root(), match="rustc", verbose=self.verbose) + self.fix_executable(self.bin_root() + "/bin/rustc") + self.fix_executable(self.bin_root() + "/bin/rustdoc") +@@ -204,8 +203,7 @@ + filename = "cargo-{}-{}.tar.gz".format('0.18.0', self.build) + url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date() + tarball = os.path.join(rustc_cache, filename) +- if not os.path.exists(tarball): +- get("{}/{}".format(url, filename), tarball, verbose=self.verbose) ++ get("{}/{}".format(url, filename), tarball, verbose=self.verbose) + unpack(tarball, self.bin_root(), match="cargo", verbose=self.verbose) + self.fix_executable(self.bin_root() + "/bin/cargo") + with open(self.cargo_stamp(), 'w') as f: +--- a/configure ++++ b/configure +@@ -612,7 +612,6 @@ + + step_msg "looking for build programs" + +-probe_need CFG_CURL curl + if [ -z "$CFG_PYTHON_PROVIDED" ]; then + probe_need CFG_PYTHON python2.7 python2 python + fi diff --git a/patches/d-host-duplicates.patch b/patches/d-host-duplicates.patch new file mode 100644 index 0000000000..6a73aa1e6d --- /dev/null +++ b/patches/d-host-duplicates.patch @@ -0,0 +1,29 @@ +Description: Work around #842634 on some machines, e.g. Debian porterboxes + This should remain commented-out in debian/patches/series, it's not needed everywhere +Author: Ximin Luo +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/libstd/sys_common/net.rs ++++ b/src/libstd/sys_common/net.rs +@@ -616,20 +616,3 @@ + .finish() + } + } +- +-#[cfg(test)] +-mod tests { +- use super::*; +- use collections::HashMap; +- +- #[test] +- fn no_lookup_host_duplicates() { +- let mut addrs = HashMap::new(); +- let lh = match lookup_host("localhost") { +- Ok(lh) => lh, +- Err(e) => panic!("couldn't resolve `localhost': {}", e) +- }; +- let _na = lh.map(|sa| *addrs.entry(sa).or_insert(0) += 1).count(); +- assert!(addrs.values().filter(|&&v| v > 1).count() == 0); +- } +-} diff --git a/patches/d-no-web-dependencies-in-doc.patch b/patches/d-no-web-dependencies-in-doc.patch new file mode 100644 index 0000000000..9344013331 --- /dev/null +++ b/patches/d-no-web-dependencies-in-doc.patch @@ -0,0 +1,227 @@ +Description: Use local web resources instead of remote ones +Author: Matthijs van Otterdijk +Bug: https://github.com/azerupi/mdBook/issues/271 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/vendor/mdbook/src/theme/index.hbs ++++ b/src/vendor/mdbook/src/theme/index.hbs +@@ -10,27 +10,19 @@ + + + +- +- + + + + +- ++ + +- ++ + + + +- ++ + +- +- +- ++ + + + +@@ -101,17 +93,10 @@ + + + +- +- +- + + {{{livereload}}} + +- ++ + + + +--- a/src/vendor/mdbook/.cargo-checksum.json ++++ b/src/vendor/mdbook/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"7612c630f7ceaf8827018e5b963438fde7229dbc1d3ab93ae3a523e8897dea58",".travis.yml":"f7395c0908345b0789deb17928eec3f6a0fe8a47357017d744996cd84ffee733","Cargo.toml":"449a70244ad490b2711c14db6ecbe0d41a21ec1d74bdf981e6d2d6851f6f1d33","LICENSE":"daccd6f5b8e0fd07c0992116280fcddc77c2a612c4ebeb64d8b114ed9da1a10b","README.md":"83aecab607b1ee604474919ff6cb5656cbdfe5fb19434ba9e376e8c0ea31a4ef","appveyor.yml":"e3709a665d17a8d34956e228a5399cdafb75a64be270a16b8ec36b1f7680d254","build.rs":"7e5ab4e28bc535181b74290dcc518a9166fc61ccf2c5a5d4c4f0b4384639b0f7","ci/before_deploy.sh":"234420ac249ed2bdc7a74d470fe2f1b898ac1e165a931a659cb23792ac399d84","ci/install.sh":"0edce34ea7a51a664b43d8397173cf484119145b7a89d913805b8635d45c92ca","ci/script.sh":"9bad90afed9fb44c2e0b0078b5d2b03f29669e3432e92e731b329420f9ceb7a3","deploy.sh":"8333f8b912eb9dc5bda56973896769a2af642ab27a477f7a4957967bec820818","rustfmt.toml":"a83bbacf9b2554d73c50739b272d5e64fb9f3d0249e72c4813071db3a96243ce","src/bin/mdbook.rs":"cf629a1cbfb786ba479337c81c723ca27e740447072436fc76de0c71b36b4f52","src/book/bookconfig.rs":"93c6bf4d41dc0a93bdf6ffda9f69f745c9093a37c40a807ba7b4dc70ab86206b","src/book/bookconfig_test.rs":"baa9d2dd36376e5d481b5fda15a0c01c847b2a8e52fce60832309277bbd19934","src/book/bookitem.rs":"4b6d39c5779bec278e5d6139a017fb306c275245d4dfd8cc5bd6325ba58903db","src/book/mod.rs":"a54e011a8b45ec5fc9c4750794c83a5b734b1b162f2f421cda43f88f83dceaa2","src/lib.rs":"1d6d728909373153ede38ccfe0425113a8a05b1d53477cedbc1535327b3b7938","src/parse/mod.rs":"8d17800a04d1b77a0fbf6b27c52a4adb0755a6d004819ebacdf5adf94f231fc4","src/parse/summary.rs":"8b8aeaeceb16c74b1ac45ab3b05e32932b9f2624a5d5b7768f02f45cef4a3178","src/renderer/html_handlebars/hbs_renderer.rs":"d2f9c345f32042840e6cb38903434fed160ae30977289c89c06e8499b429b2f5","src/renderer/html_handlebars/helpers/mod.rs":"243447b1957ece344721546933bb6643c2b084270bf0133f8b8233842936c612","src/renderer/html_handlebars/helpers/navigation.rs":"4d1cafdbf07eade70701974f70db2cf52a8f5ed8460e51aa7b26a3e2b258028e","src/renderer/html_handlebars/helpers/playpen.rs":"096b3821703235c5ce7abfee0541f87790842cd98624a13788720ec4b51fb780","src/renderer/html_handlebars/helpers/toc.rs":"da6d2554d5dea053a692d73f3946dceb372815383336ab767c0b4bbee5c59c8b","src/renderer/html_handlebars/mod.rs":"fd11f3b70867696c710a077af4030c3ff21f0b36a412d62b5628528376f1f3c2","src/renderer/mod.rs":"c530f762a3eb8c65e70372769f857b92d2eb6b355a717a3d09d1203ac87316b4","src/theme/_FontAwesome/css/font-awesome.min.css":"936ffccdc35bc55221e669d0e76034af76ba8c080c1b1149144dbbd3b5311829","src/theme/_FontAwesome/fonts/FontAwesome.otf":"7961070f76a33c1307de19ce2a93dc2b26d6747fa759aee5045118644c758acc","src/theme/_FontAwesome/fonts/fontawesome-webfont.eot":"d4f5a99224154f2a808e42a441ddc9248ffe78b7a4083684ce159270b30b912a","src/theme/_FontAwesome/fonts/fontawesome-webfont.svg":"7414288c272f6cc10304aa18e89bf24fb30f40afd644623f425c2c3d71fbe06a","src/theme/_FontAwesome/fonts/fontawesome-webfont.ttf":"1b7f3de49d68b01f415574ebb82e6110a1d09cda2071ad8451bdb5124131a292","src/theme/_FontAwesome/fonts/fontawesome-webfont.woff":"a7c7e4930090e038a280fd61d88f0dc03dad4aeaedbd8c9be3dd9aa4c3b6f8d1","src/theme/_FontAwesome/fonts/fontawesome-webfont.woff2":"3c4a1bb7ce3234407184f0d80cc4dec075e4ad616b44dcc5778e1cfb1bc24019","src/theme/book.css":"faa68e7fb58e00934baedf9bb60a4187f2568cf1b10736d9c9592adfd5c249f0","src/theme/book.js":"461df0f6998eb8c585362e4bfc84c2b29f46948025ba7f6221f88104c94ce527","src/theme/favicon.png":"8114d1fc74f4b5621ad9afde7746ed9cf7e420be317a6e29023d2298d58aa15b","src/theme/highlight.css":"a8e0cdb65ed7959c997b047be0cc3809bdabb64c093c870ddff001a45fd34831","src/theme/highlight.js":"350fc176452dcb8b6ad142004119e0df3679684f54691efbf57ed9803781d058","src/theme/index.hbs":"5e83292c4522aca17ff47c28648709314dcd9912fa391e44a11e9e2e817d042f","src/theme/jquery-2.1.4.min.js":"de4b3c3d1dc2506b6693f0f98884e1dc074cda9d66cab39b7b48a115fdfc4c0f","src/theme/mod.rs":"4f8d40c66f1dadf94a714ed9b7e5821c2078837c6b4d20ee22e9945125466c3c","src/theme/stylus/book.styl":"7424e30554a62ddde341d055a2c576ff8b36b5ad2de30af9799bf79e76748b74","src/theme/stylus/general.styl":"50c86eaeee69f3b15aca150aeb39fd370dd66831db2935344ec88d6e783c29d7","src/theme/stylus/menu.styl":"5699bc3eee208af30c7ca1a4518c347b2f043a58d0e1307cb08ab15995557fd5","src/theme/stylus/nav-icons.styl":"ce371f2eeaf0d50a6d94ce1407578908753fb4010bba30d9b0dcabfc7b3b779e","src/theme/stylus/page.styl":"a8a1718e2e4fb3d48e4d527e5400e954ab7b6a1ae87f1b6b40b28a11b6926e73","src/theme/stylus/print.styl":"54efe6860611698dc520f82b05e9e17f4cdbc913822b17f1c44e0808ecf163eb","src/theme/stylus/sidebar.styl":"648c3c3b2fa0541321a646f7742a5222f655db39e4f20ef43a9ba3dcdbdb293f","src/theme/stylus/theme-popup.styl":"8c801836bc8d91c68e933dbc3b94eaac132a3fc04fd87b85550dc1f628765447","src/theme/stylus/themes/base.styl":"cf4ba427c9fea01ca17db9af457e60ee9936d2cff1439278d549d8b200979687","src/theme/stylus/themes/coal.styl":"151ccd7de802ac319787b2a7f0e13286dcfb203f730e7324b156760167b486e9","src/theme/stylus/themes/index.styl":"4afadc7eb2fdd29408cd8ec0f2d37948a98040994a7142b3d114ae61214e6d21","src/theme/stylus/themes/light.styl":"7cf535638cdca25c94b87613facbd52036d10222144f838e8410a4e9ffd3f8e1","src/theme/stylus/themes/navy.styl":"065dad59ccee44d075805e60a07987d6d80d72051f496ec89341b1d3096c429c","src/theme/stylus/themes/rust.styl":"6aeb5a69df72824edbcf8ae963dc48b5766311eb0d03b4ecc6e9f0f32a8b0783","src/theme/stylus/variables.styl":"15f1215c0336336966a2db1a741860f2cb400d9816eaad9a1b24aba494c78f29","src/theme/tomorrow-night.css":"c50d01aea634fb78b058fa95bfa93e8338a5595a6e1cf9c34822f82a0176e418","src/utils/fs.rs":"5e25134e524b4244806b65fbec5a9088612c41731622bd5b172d015feaaf981c","src/utils/mod.rs":"3a8e2c6084faa7423511e473619119d71515d6410bd78be59cef9e5584ac7cfe"},"package":"2598843aeda0c5bb2e8e4d714564f1c3fc40f7844157e34563bf96ae3866b56e"} +\ No newline at end of file ++{"files":{},"package":"2598843aeda0c5bb2e8e4d714564f1c3fc40f7844157e34563bf96ae3866b56e"} +--- a/src/vendor/mdbook/src/theme/mod.rs ++++ b/src/vendor/mdbook/src/theme/mod.rs +@@ -7,17 +7,7 @@ + pub static CSS: &'static [u8] = include_bytes!("book.css"); + pub static FAVICON: &'static [u8] = include_bytes!("favicon.png"); + pub static JS: &'static [u8] = include_bytes!("book.js"); +-pub static HIGHLIGHT_JS: &'static [u8] = include_bytes!("highlight.js"); + pub static TOMORROW_NIGHT_CSS: &'static [u8] = include_bytes!("tomorrow-night.css"); +-pub static HIGHLIGHT_CSS: &'static [u8] = include_bytes!("highlight.css"); +-pub static JQUERY: &'static [u8] = include_bytes!("jquery-2.1.4.min.js"); +-pub static FONT_AWESOME: &'static [u8] = include_bytes!("_FontAwesome/css/font-awesome.min.css"); +-pub static FONT_AWESOME_EOT: &'static [u8] = include_bytes!("_FontAwesome/fonts/fontawesome-webfont.eot"); +-pub static FONT_AWESOME_SVG: &'static [u8] = include_bytes!("_FontAwesome/fonts/fontawesome-webfont.svg"); +-pub static FONT_AWESOME_TTF: &'static [u8] = include_bytes!("_FontAwesome/fonts/fontawesome-webfont.ttf"); +-pub static FONT_AWESOME_WOFF: &'static [u8] = include_bytes!("_FontAwesome/fonts/fontawesome-webfont.woff"); +-pub static FONT_AWESOME_WOFF2: &'static [u8] = include_bytes!("_FontAwesome/fonts/fontawesome-webfont.woff2"); +-pub static FONT_AWESOME_OTF: &'static [u8] = include_bytes!("_FontAwesome/fonts/FontAwesome.otf"); + + /// The `Theme` struct should be used instead of the static variables because the `new()` method + /// will look if the user has a theme directory in his source folder and use the users theme instead +@@ -30,10 +20,7 @@ + pub css: Vec, + pub favicon: Vec, + pub js: Vec, +- pub highlight_css: Vec, + pub tomorrow_night_css: Vec, +- pub highlight_js: Vec, +- pub jquery: Vec, + } + + impl Theme { +@@ -45,10 +32,7 @@ + css: CSS.to_owned(), + favicon: FAVICON.to_owned(), + js: JS.to_owned(), +- highlight_css: HIGHLIGHT_CSS.to_owned(), + tomorrow_night_css: TOMORROW_NIGHT_CSS.to_owned(), +- highlight_js: HIGHLIGHT_JS.to_owned(), +- jquery: JQUERY.to_owned(), + }; + + // Check if the given path exists +@@ -82,18 +66,6 @@ + let _ = f.read_to_end(&mut theme.favicon); + } + +- // highlight.js +- if let Ok(mut f) = File::open(&src.join("highlight.js")) { +- theme.highlight_js.clear(); +- let _ = f.read_to_end(&mut theme.highlight_js); +- } +- +- // highlight.css +- if let Ok(mut f) = File::open(&src.join("highlight.css")) { +- theme.highlight_css.clear(); +- let _ = f.read_to_end(&mut theme.highlight_css); +- } +- + // tomorrow-night.css + if let Ok(mut f) = File::open(&src.join("tomorrow-night.css")) { + theme.tomorrow_night_css.clear(); +--- a/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs ++++ b/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +@@ -162,17 +162,7 @@ + try!(book.write_file("book.js", &theme.js)); + try!(book.write_file("book.css", &theme.css)); + try!(book.write_file("favicon.png", &theme.favicon)); +- try!(book.write_file("jquery.js", &theme.jquery)); +- try!(book.write_file("highlight.css", &theme.highlight_css)); + try!(book.write_file("tomorrow-night.css", &theme.tomorrow_night_css)); +- try!(book.write_file("highlight.js", &theme.highlight_js)); +- try!(book.write_file("_FontAwesome/css/font-awesome.css", theme::FONT_AWESOME)); +- try!(book.write_file("_FontAwesome/fonts/fontawesome-webfont.eot", theme::FONT_AWESOME_EOT)); +- try!(book.write_file("_FontAwesome/fonts/fontawesome-webfont.svg", theme::FONT_AWESOME_SVG)); +- try!(book.write_file("_FontAwesome/fonts/fontawesome-webfont.ttf", theme::FONT_AWESOME_TTF)); +- try!(book.write_file("_FontAwesome/fonts/fontawesome-webfont.woff", theme::FONT_AWESOME_WOFF)); +- try!(book.write_file("_FontAwesome/fonts/fontawesome-webfont.woff2", theme::FONT_AWESOME_WOFF2)); +- try!(book.write_file("_FontAwesome/fonts/FontAwesome.ttf", theme::FONT_AWESOME_TTF)); + + // Copy all remaining files + try!(utils::fs::copy_files_except_ext(book.get_src(), book.get_dest(), true, &["md"])); +--- a/src/tools/linkchecker/main.rs ++++ b/src/tools/linkchecker/main.rs +@@ -175,6 +175,11 @@ + url.starts_with("irc:") || url.starts_with("data:") { + return; + } ++ // Ignore parent URLs, so that the package installation process can ++ // provide a symbolic link later ++ if url.starts_with("../") { ++ return; ++ } + let mut parts = url.splitn(2, "#"); + let url = parts.next().unwrap(); + let fragment = parts.next(); +--- a/src/vendor/mdbook/src/book/mod.rs ++++ b/src/vendor/mdbook/src/book/mod.rs +@@ -276,14 +276,6 @@ + let mut js = try!(File::create(&theme_dir.join("book.js"))); + try!(js.write_all(theme::JS)); + +- // highlight.css +- let mut highlight_css = try!(File::create(&theme_dir.join("highlight.css"))); +- try!(highlight_css.write_all(theme::HIGHLIGHT_CSS)); +- +- // highlight.js +- let mut highlight_js = try!(File::create(&theme_dir.join("highlight.js"))); +- try!(highlight_js.write_all(theme::HIGHLIGHT_JS)); +- + Ok(()) + } + +--- a/src/doc/book/second-edition/theme/index.hbs ++++ b/src/doc/book/second-edition/theme/index.hbs +@@ -10,14 +10,13 @@ + + + +- + + + + +- ++ + +- ++ + + + + +- ++ + +- +- +- ++ + + + +@@ -143,13 +136,6 @@ + + + +- +- +- + + {{{livereload}}} + diff --git a/patches/d-prefer-dynamic.patch b/patches/d-prefer-dynamic.patch new file mode 100644 index 0000000000..13bb429220 --- /dev/null +++ b/patches/d-prefer-dynamic.patch @@ -0,0 +1,18 @@ +Description: Prefer dynamic linking (currently disabled, not applied) + As per Debian policy, we basically revert + https://github.com/rust-lang/rfcs/blob/master/text/0404-change-prefer-dynamic.md + TODO: this does not yet work: https://github.com/rust-lang/rust/issues/43289 + Perhaps a better method would be to modify dh-cargo instead of rustc +Author: Ximin Luo +Forwarded: not-needed +--- a/src/librustc/session/config.rs ++++ b/src/librustc/session/config.rs +@@ -846,7 +846,7 @@ + "don't run LLVM's SLP vectorization pass"), + soft_float: bool = (false, parse_bool, [TRACKED], + "use soft float ABI (*eabihf targets only)"), +- prefer_dynamic: bool = (false, parse_bool, [TRACKED], ++ prefer_dynamic: bool = (true, parse_bool, [TRACKED], + "prefer dynamic linking to static linking"), + no_integrated_as: bool = (false, parse_bool, [TRACKED], + "use an external assembler rather than LLVM's integrated one"), diff --git a/patches/d-raise-min-llvm-version.patch b/patches/d-raise-min-llvm-version.patch new file mode 100644 index 0000000000..14eaa86c3a --- /dev/null +++ b/patches/d-raise-min-llvm-version.patch @@ -0,0 +1,28 @@ +Description: Raise LLVM min version for some tests + According to the comments at the top of the files being patched, they require + either LLVM 4.0 or Rust's patched LLVM. So just avoid them in Debian. +Author: Ximin Luo +Forwarded: not-needed +--- +--- a/src/test/codegen/mainsubprogram.rs ++++ b/src/test/codegen/mainsubprogram.rs +@@ -15,7 +15,7 @@ + // ignore-tidy-linelength + // ignore-windows + // ignore-macos +-// min-llvm-version 3.8 ++// min-llvm-version 4.0 + + // compile-flags: -g -C no-prepopulate-passes + +--- a/src/test/codegen/mainsubprogramstart.rs ++++ b/src/test/codegen/mainsubprogramstart.rs +@@ -15,7 +15,7 @@ + // ignore-tidy-linelength + // ignore-windows + // ignore-macos +-// min-llvm-version 3.8 ++// min-llvm-version 4.0 + + // compile-flags: -g -C no-prepopulate-passes + diff --git a/patches/d-rust-gdb-paths b/patches/d-rust-gdb-paths new file mode 100644 index 0000000000..f0dc4b9a85 --- /dev/null +++ b/patches/d-rust-gdb-paths @@ -0,0 +1,28 @@ +Description: Hardcode GDB python module directory + Debian package installs python modules into a fixed directory, so + just hardcode path in wrapper script. +Author: Angus Lees +Forwarded: not-needed + +--- a/src/etc/rust-gdb ++++ b/src/etc/rust-gdb +@@ -13,14 +13,16 @@ + set -e + + # Find out where the pretty printer Python module is +-RUSTC_SYSROOT=`rustc --print=sysroot` +-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++#RUSTC_SYSROOT=`rustc --print=sysroot` ++#GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++# We can just hardcode this on Debian, and remove the rustc dependency ++GDB_PYTHON_MODULE_DIRECTORY="/usr/share/rust-gdb" + + # Run GDB with the additional arguments that load the pretty printers + # Set the environment variable `RUST_GDB` to overwrite the call to a + # different/specific command (defaults to `gdb`). + RUST_GDB="${RUST_GDB:-gdb}" +-PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" ${RUST_GDB} \ ++PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \ + -d "$GDB_PYTHON_MODULE_DIRECTORY" \ + -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \ + "$@" diff --git a/patches/d-rust-lldb-paths b/patches/d-rust-lldb-paths new file mode 100644 index 0000000000..34b8679213 --- /dev/null +++ b/patches/d-rust-lldb-paths @@ -0,0 +1,33 @@ +Description: Hardcode LLDB python module directory + Debian package installs python modules into a fixed directory, so + just hardcode path in wrapper script. +Author: Angus Lees +Forwarded: not-needed + +--- a/src/etc/rust-lldb ++++ b/src/etc/rust-lldb +@@ -12,7 +12,7 @@ + # Exit if anything fails + set -e + +-LLDB_VERSION=`lldb --version 2>/dev/null | head -1 | cut -d. -f1` ++LLDB_VERSION=`lldb-3.9 --version 2>/dev/null | head -1 | cut -d. -f1` + + if [ "$LLDB_VERSION" = "lldb-350" ] + then +@@ -29,13 +29,10 @@ + # Make sure to delete the tempfile no matter what + trap "rm -f $TMPFILE; exit" INT TERM EXIT + +-# Find out where to look for the pretty printer Python module +-RUSTC_SYSROOT=`rustc --print sysroot` +- + # Write the LLDB script to the tempfile +-echo "command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" >> $TMPFILE ++echo "command script import \"/usr/share/rust-lldb/lldb_rust_formatters.py\"" >> $TMPFILE + echo "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" >> $TMPFILE + echo "type category enable Rust" >> $TMPFILE + + # Call LLDB with the script added to the argument list +-lldb --source-before-file="$TMPFILE" "$@" ++lldb-3.9 --source-before-file="$TMPFILE" "$@" diff --git a/patches/d-use-system-jquery.patch b/patches/d-use-system-jquery.patch new file mode 100644 index 0000000000..64951a6761 --- /dev/null +++ b/patches/d-use-system-jquery.patch @@ -0,0 +1,21 @@ +--- a/src/librustdoc/html/render.rs ++++ b/src/librustdoc/html/render.rs +@@ -660,8 +660,16 @@ + // Add all the static files. These may already exist, but we just + // overwrite them anyway to make sure that they're fresh and up-to-date. + +- write(cx.dst.join("jquery.js"), +- include_bytes!("static/jquery-2.1.4.min.js"))?; ++ { ++ // In Debian, just copy the system jquery instead. ++ // If the file gets installed, we can eventually create something like ++ // dh_rustdoc, similar to dh_sphinxdoc to detect these copies and ++ // convert them into symlinks. ++ let jquery_system_path = "/usr/share/javascript/jquery/jquery.min.js"; ++ let jquery = cx.dst.join("jquery.js"); ++ let jquery = jquery.as_path(); ++ try_err!(fs::copy(jquery_system_path, jquery), &jquery); ++ } + write(cx.dst.join("main.js"), + include_bytes!("static/main.js"))?; + write(cx.dst.join("rustdoc.css"), diff --git a/patches/gcc-4.8-aarch64-ice.diff b/patches/gcc-4.8-aarch64-ice.diff new file mode 100644 index 0000000000..bc9f90e315 --- /dev/null +++ b/patches/gcc-4.8-aarch64-ice.diff @@ -0,0 +1,23 @@ +--- a/src/compiler-rt/lib/builtins/trunctfdf2.c ++++ b/src/compiler-rt/lib/builtins/trunctfdf2.c +@@ -7,6 +7,12 @@ + // + //===----------------------------------------------------------------------===// + ++#if defined(__aarch64__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ <= 8) ++// work around https://launchpad.net/bugs/1667761 ++#pragma GCC push_options ++#pragma GCC optimize "O1" ++#endif ++ + #define QUAD_PRECISION + #include "fp_lib.h" + +@@ -20,3 +26,7 @@ + } + + #endif ++ ++#if defined(__aarch64__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ <= 8) ++#pragma GCC pop_options ++#endif diff --git a/patches/series b/patches/series new file mode 100644 index 0000000000..45d950767b --- /dev/null +++ b/patches/series @@ -0,0 +1,42 @@ +# Patches for upstream + +# applied already +u-fix-debuginfo.patch +u-rust-1.18.0-no-fail-fast.patch +u-only-run-linkchecker-if-docs.patch +u-fix-build_01.patch +u-fix-build_02.patch +u-skip-main-thread-stack-guard.patch + +# pending, forwarded +u-ignoretest-armhf_01.patch +u-ignoretest-armhf_02.patch +u-ignoretest-armhf_03.patch +u-ignoretest-armhf_05.patch +u-ignoretest-armhf_06.patch +u-ignoretest-arm64.patch +u-ignoretest-ppc64el.patch +u-workaround-testfailure-armhf_01.patch +u-allow-disable-debuginfo-only-std.patch +u-gperf-3.1.patch + +# not forwarded, or forwarded but unlikely to be merged +u-exception-traceback.patch +u-reproducible-dl-stage0.patch +u-allow-stable-features.patch + +gcc-4.8-aarch64-ice.diff + +# Debian-specific patches, not suitable for upstream +d-raise-min-llvm-version.patch +d-disable-cargo-vendor.patch +d-rust-gdb-paths +d-rust-lldb-paths +d-add-soname.patch +d-dont-download-stage0.patch +d-use-system-jquery.patch +d-cross-compile-install.patch +d-no-web-dependencies-in-doc.patch + +# Work around for some porterboxes, keep this commented +#d-host-duplicates.patch diff --git a/patches/u-allow-disable-debuginfo-only-std.patch b/patches/u-allow-disable-debuginfo-only-std.patch new file mode 100644 index 0000000000..0d04d31b9e --- /dev/null +++ b/patches/u-allow-disable-debuginfo-only-std.patch @@ -0,0 +1,27 @@ +Description: configure: allow distros to disable debuginfo-only-std +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/pull/43297 +--- a/configure ++++ b/configure +@@ -558,8 +558,8 @@ + *-pc-windows-gnu) + ;; + *) +- CFG_ENABLE_DEBUGINFO_LINES=1 +- CFG_ENABLE_DEBUGINFO_ONLY_STD=1 ++ enable_if_not_disabled debuginfo-lines ++ enable_if_not_disabled debuginfo-only-std + ;; + esac + +@@ -570,8 +570,8 @@ + *-pc-windows-gnu) + ;; + *) +- CFG_ENABLE_DEBUGINFO_LINES=1 +- CFG_ENABLE_DEBUGINFO_ONLY_STD=1 ++ enable_if_not_disabled debuginfo-lines ++ enable_if_not_disabled debuginfo-only-std + ;; + esac + ;; diff --git a/patches/u-allow-stable-features.patch b/patches/u-allow-stable-features.patch new file mode 100644 index 0000000000..c914f9c4ed --- /dev/null +++ b/patches/u-allow-stable-features.patch @@ -0,0 +1,14 @@ +Description: Fix compiletest to allow bootstrapping from 1.17 as well as 1.16 +Author: Matthijs van Otterdijk +Forwarded: https://github.com/rust-lang/rust/pull/42020 +--- +--- a/src/tools/compiletest/src/main.rs ++++ b/src/tools/compiletest/src/main.rs +@@ -16,6 +16,7 @@ + #![feature(libc)] + + #![deny(warnings)] ++#![allow(stable_features)] // needed to compile the tests with both 1.16 and 1.17 + + extern crate libc; + extern crate test; diff --git a/patches/u-exception-traceback.patch b/patches/u-exception-traceback.patch new file mode 100644 index 0000000000..cb4452f0da --- /dev/null +++ b/patches/u-exception-traceback.patch @@ -0,0 +1,17 @@ +Description: Print exception traceback when build fails +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/pull/42792 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -602,7 +602,8 @@ + exit_code = e.code + else: + exit_code = 1 +- print(e) ++ import traceback ++ traceback.print_exc() + if not help_triggered: + print("Build completed unsuccessfully in %s" % format_build_time(time() - start_time)) + sys.exit(exit_code) diff --git a/patches/u-fix-build_01.patch b/patches/u-fix-build_01.patch new file mode 100644 index 0000000000..a869481239 --- /dev/null +++ b/patches/u-fix-build_01.patch @@ -0,0 +1,42 @@ +Description: Use custom cargo/rustc paths when parsing flags. +Author: Mark Simulacrum +Bug: https://github.com/rust-lang/rust/issues/42543 +Applied-Upstream: commit:73267374d4176ac1c5d685ff2bac36556cfa4730 + +--- a/src/bootstrap/flags.rs ++++ b/src/bootstrap/flags.rs +@@ -234,11 +234,18 @@ + let cwd = t!(env::current_dir()); + let paths = matches.free[1..].iter().map(|p| cwd.join(p)).collect::>(); + ++ let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| { ++ if fs::metadata("config.toml").is_ok() { ++ Some(PathBuf::from("config.toml")) ++ } else { ++ None ++ } ++ }); + + // All subcommands can have an optional "Available paths" section + if matches.opt_present("verbose") { + let flags = Flags::parse(&["build".to_string()]); +- let mut config = Config::default(); ++ let mut config = Config::parse(&flags.build, cfg_file.clone()); + config.build = flags.build.clone(); + let mut build = Build::new(flags, config); + metadata::build(&mut build); +@@ -295,14 +302,6 @@ + }; + + +- let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| { +- if fs::metadata("config.toml").is_ok() { +- Some(PathBuf::from("config.toml")) +- } else { +- None +- } +- }); +- + let mut stage = matches.opt_str("stage").map(|j| j.parse().unwrap()); + + if matches.opt_present("incremental") { diff --git a/patches/u-fix-build_02.patch b/patches/u-fix-build_02.patch new file mode 100644 index 0000000000..917de6d8b7 --- /dev/null +++ b/patches/u-fix-build_02.patch @@ -0,0 +1,56 @@ +Description: Fixes bootstrapping with custom cargo/rustc. + config.mk is now always read when parsing the configuration to prevent + this from reoccurring in the future, hopefully. +Author: Mark Simulacrum +Bug: https://github.com/rust-lang/rust/issues/42543 +Applied-Upstream: commit:4caa0b020f146e4504ab8ffdd52df29deaa49a09 + +--- a/src/bootstrap/bin/main.rs ++++ b/src/bootstrap/bin/main.rs +@@ -26,12 +26,6 @@ + fn main() { + let args = env::args().skip(1).collect::>(); + let flags = Flags::parse(&args); +- let mut config = Config::parse(&flags.build, flags.config.clone()); +- +- // compat with `./configure` while we're still using that +- if std::fs::metadata("config.mk").is_ok() { +- config.update_with_config_mk(); +- } +- ++ let config = Config::parse(&flags.build, flags.config.clone()); + Build::new(flags, config).build(); + } +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -15,7 +15,7 @@ + + use std::collections::HashMap; + use std::env; +-use std::fs::File; ++use std::fs::{self, File}; + use std::io::prelude::*; + use std::path::PathBuf; + use std::process; +@@ -395,6 +395,12 @@ + set(&mut config.rust_dist_src, t.src_tarball); + } + ++ ++ // compat with `./configure` while we're still using that ++ if fs::metadata("config.mk").is_ok() { ++ config.update_with_config_mk(); ++ } ++ + return config + } + +@@ -403,7 +409,7 @@ + /// While we still have `./configure` this implements the ability to decode + /// that configuration into this. This isn't exactly a full-blown makefile + /// parser, but hey it gets the job done! +- pub fn update_with_config_mk(&mut self) { ++ fn update_with_config_mk(&mut self) { + let mut config = String::new(); + File::open("config.mk").unwrap().read_to_string(&mut config).unwrap(); + for line in config.lines() { diff --git a/patches/u-fix-debuginfo.patch b/patches/u-fix-debuginfo.patch new file mode 100644 index 0000000000..45467defed --- /dev/null +++ b/patches/u-fix-debuginfo.patch @@ -0,0 +1,16 @@ +Description: Fix some debuginfo tests +Author: Kai Noda +Bug: https://github.com/rust-lang/rust/issues/40557 +--- +--- a/src/tools/compiletest/src/runtest.rs ++++ b/src/tools/compiletest/src/runtest.rs +@@ -645,6 +645,9 @@ + script_str.push_str(&format!("file {}\n", + exe_file.to_str().unwrap() + .replace(r"\", r"\\"))); ++ if self.config.gdb_native_rust { ++ script_str.push_str("set language rust\n"); ++ } + + // Add line breakpoints + for line in &breakpoint_lines { diff --git a/patches/u-gperf-3.1.patch b/patches/u-gperf-3.1.patch new file mode 100644 index 0000000000..5e48214e43 --- /dev/null +++ b/patches/u-gperf-3.1.patch @@ -0,0 +1,20 @@ +Description: Support gperf 3.1 + gperf 3.1 will output `register size_t n` instead of `register unsigned int n` + like [here](https://github.com/hoedown/hoedown/blob/2508c4b/src/html_blocks.c#L62). + This requires `stddef.h`; giving `-I` to the `gperf` invocation will include + `string.h` which includes `stddef.h`. +Author: Ximin Luo +Bug: https://github.com/hoedown/hoedown/pull/215 +diff --git a/src/rt/hoedown/Makefile b/src/rt/hoedown/Makefile +index 2b16b887b..378682768 100644 +--- a/src/rt/hoedown/Makefile ++++ b/src/rt/hoedown/Makefile +@@ -51,7 +51,7 @@ smartypants: bin/smartypants.o $(HOEDOWN_SRC) + # Perfect hashing + + src/html_blocks.c: html_block_names.gperf +- gperf -L ANSI-C -N hoedown_find_block_tag -c -C -E -S 1 --ignore-case -m100 $^ > $@ ++ gperf -I -L ANSI-C -N hoedown_find_block_tag -c -C -E -S 1 --ignore-case -m100 $^ > $@ + + # Testing + diff --git a/patches/u-ignoretest-arm64.patch b/patches/u-ignoretest-arm64.patch new file mode 100644 index 0000000000..5668a6317e --- /dev/null +++ b/patches/u-ignoretest-arm64.patch @@ -0,0 +1,10 @@ +--- a/src/test/run-pass-valgrind/down-with-thread-dtors.rs ++++ b/src/test/run-pass-valgrind/down-with-thread-dtors.rs +@@ -8,6 +8,7 @@ + // option. This file may not be copied, modified, or distributed + // except according to those terms. + ++// ignore-aarch64 + // no-prefer-dynamic + // ignore-emscripten + diff --git a/patches/u-ignoretest-armhf_01.patch b/patches/u-ignoretest-armhf_01.patch new file mode 100644 index 0000000000..b336fc10f3 --- /dev/null +++ b/patches/u-ignoretest-armhf_01.patch @@ -0,0 +1,21 @@ +Description: Ignore atomic-lock-free tests on armhf + Last checked this still affects 1.17 +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/40238 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/test/run-make/atomic-lock-free/Makefile ++++ b/src/test/run-make/atomic-lock-free/Makefile +@@ -5,6 +5,7 @@ + + all: + ifeq ($(UNAME),Linux) ++ifeq (,$(filter armv7-unknown-linux-gnueabihf,$(TARGET))) + ifeq ($(filter x86,$(LLVM_COMPONENTS)),x86) + $(RUSTC) --target=i686-unknown-linux-gnu atomic_lock_free.rs + nm "$(TMPDIR)/libatomic_lock_free.rlib" | grep -vq __atomic_fetch_add +@@ -40,3 +41,4 @@ + nm "$(TMPDIR)/libatomic_lock_free.rlib" | grep -vq __atomic_fetch_add + endif + endif ++endif diff --git a/patches/u-ignoretest-armhf_02.patch b/patches/u-ignoretest-armhf_02.patch new file mode 100644 index 0000000000..e4fa8c67b6 --- /dev/null +++ b/patches/u-ignoretest-armhf_02.patch @@ -0,0 +1,32 @@ +Description: Disable some relocation-model tests for armhf + Last checked this still affects 1.17 +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/40145 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/test/run-make/relocation-model/Makefile ++++ b/src/test/run-make/relocation-model/Makefile +@@ -1,17 +1,22 @@ + -include ../tools.mk + + all: others ++ifneq ($(filter arm,$(LLVM_COMPONENTS)),arm) ++# FIXME(#40145) + $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default foo.rs + $(call RUN,foo) +- ++endif + $(RUSTC) -C relocation-model=dynamic-no-pic --crate-type=dylib foo.rs --emit=link,obj + + ifdef IS_MSVC + # FIXME(#28026) + others: ++else ifeq ($(filter arm,$(LLVM_COMPONENTS)),arm) ++# FIXME(#40145) ++others: + else + others: + $(RUSTC) -C relocation-model=static foo.rs diff --git a/patches/u-ignoretest-armhf_03.patch b/patches/u-ignoretest-armhf_03.patch new file mode 100644 index 0000000000..1448832bc6 --- /dev/null +++ b/patches/u-ignoretest-armhf_03.patch @@ -0,0 +1,23 @@ +Description: Disable reference.md "Items_and_attributes_15" doctest, failing on armhf + This passes on i386 amd64 arm64 + . + See https://gist.github.com/infinity0/2f5452d4ee9deb2f1bacb8b39c987c9c + for thread stacktrace from 1.10.0 when it hung instead of failed; eddyb from + #rustc suggested this might be an LLVM issue. + . + Last checked this still affects 1.17 +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/40260 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/doc/reference/src/items.md ++++ b/src/doc/reference/src/items.md +@@ -407,7 +407,7 @@ + in the same way as any other Rust function, except that they have the `extern` + modifier. + +-```rust ++```rust,ignore + // Declares an extern fn, the ABI defaults to "C" + extern fn new_i32() -> i32 { 0 } + diff --git a/patches/u-ignoretest-armhf_05.patch b/patches/u-ignoretest-armhf_05.patch new file mode 100644 index 0000000000..237edd95a6 --- /dev/null +++ b/patches/u-ignoretest-armhf_05.patch @@ -0,0 +1,16 @@ +Description: Disable failing debuginfo-gdb test on armhf + Last checked this still affects 1.17 +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/42673 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/test/debuginfo/macro-stepping.rs ++++ b/src/test/debuginfo/macro-stepping.rs +@@ -11,6 +11,7 @@ + // ignore-windows + // ignore-android + // ignore-aarch64 ++// ignore-arm + // min-lldb-version: 310 + + // aux-build:macro-stepping.rs diff --git a/patches/u-ignoretest-armhf_06.patch b/patches/u-ignoretest-armhf_06.patch new file mode 100644 index 0000000000..901e40bbbe --- /dev/null +++ b/patches/u-ignoretest-armhf_06.patch @@ -0,0 +1,16 @@ +Description: Disable failing run-make test on armhf + Last checked this still affects 1.18 +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/43329 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/test/run-make/extern-fn-struct-passing-abi/Makefile ++++ b/src/test/run-make/extern-fn-struct-passing-abi/Makefile +@@ -1,5 +1,7 @@ + -include ../tools.mk + + all: $(call NATIVE_STATICLIB,test) ++ifeq (,$(filter armv7-unknown-linux-gnueabihf,$(TARGET))) + $(RUSTC) test.rs + $(call RUN,test) || exit 1 ++endif diff --git a/patches/u-ignoretest-ppc64el.patch b/patches/u-ignoretest-ppc64el.patch new file mode 100644 index 0000000000..c820ed334e --- /dev/null +++ b/patches/u-ignoretest-ppc64el.patch @@ -0,0 +1,43 @@ +Description: Ignore failing tests on ppc64el + There is a workaround (see bug below) but we can't use it due to + https://github.com/rust-lang/rust/issues/42476 + https://github.com/rust-lang/rust/issues/42532 +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/issues/39015 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/libarena/lib.rs ++++ b/src/libarena/lib.rs +@@ -579,6 +579,9 @@ + + #[test] + fn test_typed_arena_drop_small_count() { ++ if cfg!(target_arch = "powerpc64") { ++ return; ++ } + DROP_COUNTER.with(|c| c.set(0)); + { + let arena: TypedArena = TypedArena::new(); +--- a/src/libstd/thread/local.rs ++++ b/src/libstd/thread/local.rs +@@ -395,7 +395,7 @@ + #[cfg(all(test, not(target_os = "emscripten")))] + mod tests { + use sync::mpsc::{channel, Sender}; +- use cell::{Cell, UnsafeCell}; ++ use cell::UnsafeCell; + use super::LocalKeyState; + use thread; + +@@ -408,9 +408,9 @@ + } + } + +- #[test] ++ #[test] #[cfg(not(target_arch = "powerpc64"))] + fn smoke_no_dtor() { +- thread_local!(static FOO: Cell = Cell::new(1)); ++ thread_local!(static FOO: ::cell::Cell = ::cell::Cell::new(1)); + + FOO.with(|f| { + assert_eq!(f.get(), 1); diff --git a/patches/u-only-run-linkchecker-if-docs.patch b/patches/u-only-run-linkchecker-if-docs.patch new file mode 100644 index 0000000000..e3cb11c339 --- /dev/null +++ b/patches/u-only-run-linkchecker-if-docs.patch @@ -0,0 +1,17 @@ +Description: Only run check-linkchecker when actually building docs + Otherwise the build fails, when running tests but not building docs +Author: Ximin Luo +Bug: https://github.com/rust-lang/rust/pull/42651 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/bootstrap/step.rs ++++ b/src/bootstrap/step.rs +@@ -463,7 +463,7 @@ + rules.test("check-linkchecker", "src/tools/linkchecker") + .dep(|s| s.name("tool-linkchecker").stage(0)) + .dep(|s| s.name("default:doc")) +- .default(true) ++ .default(build.config.docs) + .host(true) + .run(move |s| check::linkcheck(build, s.target)); + rules.test("check-cargotest", "src/tools/cargotest") diff --git a/patches/u-reproducible-dl-stage0.patch b/patches/u-reproducible-dl-stage0.patch new file mode 100644 index 0000000000..e348861434 --- /dev/null +++ b/patches/u-reproducible-dl-stage0.patch @@ -0,0 +1,11 @@ +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -84,7 +84,7 @@ + option = "-#" + else: + option = "-s" +- run(["curl", option, "--retry", "3", "-Sf", "-o", path, url], ++ run(["curl", option, "-R", "--retry", "3", "-Sf", "-o", path, url], + verbose=verbose, + exception=exception) + diff --git a/patches/u-rust-1.18.0-no-fail-fast.patch b/patches/u-rust-1.18.0-no-fail-fast.patch new file mode 100644 index 0000000000..9d234008aa --- /dev/null +++ b/patches/u-rust-1.18.0-no-fail-fast.patch @@ -0,0 +1,368 @@ +From 9d8fc50c4a989c934f9473e28022b86a07556dca Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Tue, 6 Jun 2017 12:59:04 -0700 +Subject: [PATCH] rustbuild: Add `./x.py test --no-fail-fast` + +This option forwards to each `cargo test` invocation, and applies the +same logic across all test steps to keep going after failures. At the +end, a brief summary line reports how many commands failed, if any. + +Note that if a test program fails to even start at all, or if an +auxiliary build command related to testing fails, these are still left +to stop everything right away. + +Fixes #40219. +--- + src/bootstrap/check.rs | 53 ++++++++++++++++++++++++++++++++++++++----------- + src/bootstrap/flags.rs | 14 ++++++++++++- + src/bootstrap/lib.rs | 22 +++++++++++++++++++- + src/bootstrap/step.rs | 12 +++++++++-- + src/build_helper/lib.rs | 38 ++++++++++++++++++++++++----------- + 5 files changed, 111 insertions(+), 28 deletions(-) + +diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs +index f8f641060c44..f39a7ba61213 100644 +--- a/src/bootstrap/check.rs ++++ b/src/bootstrap/check.rs +@@ -58,6 +58,29 @@ impl fmt::Display for TestKind { + } + } + ++fn try_run(build: &Build, cmd: &mut Command) { ++ if build.flags.cmd.no_fail_fast() { ++ if !build.try_run(cmd) { ++ let failures = build.delayed_failures.get(); ++ build.delayed_failures.set(failures + 1); ++ } ++ } else { ++ build.run(cmd); ++ } ++} ++ ++#[allow(unused)] ++fn try_run_quiet(build: &Build, cmd: &mut Command) { ++ if build.flags.cmd.no_fail_fast() { ++ if !build.try_run_quiet(cmd) { ++ let failures = build.delayed_failures.get(); ++ build.delayed_failures.set(failures + 1); ++ } ++ } else { ++ build.run_quiet(cmd); ++ } ++} ++ + /// Runs the `linkchecker` tool as compiled in `stage` by the `host` compiler. + /// + /// This tool in `src/tools` will verify the validity of all our links in the +@@ -67,8 +90,8 @@ pub fn linkcheck(build: &Build, host: &str) { + let compiler = Compiler::new(0, host); + + let _time = util::timeit(); +- build.run(build.tool_cmd(&compiler, "linkchecker") +- .arg(build.out.join(host).join("doc"))); ++ try_run(build, build.tool_cmd(&compiler, "linkchecker") ++ .arg(build.out.join(host).join("doc"))); + } + + /// Runs the `cargotest` tool as compiled in `stage` by the `host` compiler. +@@ -95,9 +118,9 @@ pub fn cargotest(build: &Build, stage: u32, host: &str) { + let _time = util::timeit(); + let mut cmd = Command::new(build.tool(&Compiler::new(0, host), "cargotest")); + build.prepare_tool_cmd(compiler, &mut cmd); +- build.run(cmd.env("PATH", newpath) +- .arg(&build.cargo) +- .arg(&out_dir)); ++ try_run(build, cmd.env("PATH", newpath) ++ .arg(&build.cargo) ++ .arg(&out_dir)); + } + + /// Runs the `tidy` tool as compiled in `stage` by the `host` compiler. +@@ -113,7 +136,7 @@ pub fn tidy(build: &Build, host: &str) { + if !build.config.vendor { + cmd.arg("--no-vendor"); + } +- build.run(&mut cmd); ++ try_run(build, &mut cmd); + } + + fn testdir(build: &Build, host: &str) -> PathBuf { +@@ -261,7 +284,7 @@ pub fn compiletest(build: &Build, + } + + let _time = util::timeit(); +- build.run(&mut cmd); ++ try_run(build, &mut cmd); + } + + /// Run `rustdoc --test` for all documentation in `src/doc`. +@@ -337,7 +360,7 @@ fn markdown_test(build: &Build, compiler: &Compiler, markdown: &Path) { + } + cmd.arg("--test-args").arg(test_args); + +- build.run(&mut cmd); ++ try_run(build, &mut cmd); + } + + /// Run all unit tests plus documentation tests for an entire crate DAG defined +@@ -388,6 +411,9 @@ pub fn krate(build: &Build, + cargo.arg("--manifest-path") + .arg(build.src.join(path).join("Cargo.toml")) + .arg("--features").arg(features); ++ if test_kind.subcommand() == "test" && build.flags.cmd.no_fail_fast() { ++ cargo.arg("--no-fail-fast"); ++ } + + match krate { + Some(krate) => { +@@ -452,7 +478,7 @@ pub fn krate(build: &Build, + krate_qemu(build, &compiler, target, mode); + } else { + cargo.args(&build.flags.cmd.test_args()); +- build.run(&mut cargo); ++ try_run(build, &mut cargo); + } + } + +@@ -521,7 +547,7 @@ fn krate_emscripten(build: &Build, + if build.config.quiet_tests { + cmd.arg("--quiet"); + } +- build.run(&mut cmd); ++ try_run(build, &mut cmd); + } + } + +@@ -544,7 +570,7 @@ fn krate_qemu(build: &Build, + cmd.arg("--quiet"); + } + cmd.args(&build.flags.cmd.test_args()); +- build.run(&mut cmd); ++ try_run(build, &mut cmd); + } + } + +@@ -671,6 +697,9 @@ pub fn bootstrap(build: &Build) { + .current_dir(build.src.join("src/bootstrap")) + .env("CARGO_TARGET_DIR", build.out.join("bootstrap")) + .env("RUSTC", &build.rustc); ++ if build.flags.cmd.no_fail_fast() { ++ cmd.arg("--no-fail-fast"); ++ } + cmd.arg("--").args(&build.flags.cmd.test_args()); +- build.run(&mut cmd); ++ try_run(build, &mut cmd); + } +diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs +index a1466d68a135..1ed759d24c54 100644 +--- a/src/bootstrap/flags.rs ++++ b/src/bootstrap/flags.rs +@@ -61,6 +61,7 @@ pub enum Subcommand { + Test { + paths: Vec, + test_args: Vec, ++ no_fail_fast: bool, + }, + Bench { + paths: Vec, +@@ -137,7 +138,10 @@ To learn more about a subcommand, run `./x.py -h`"); + + // Some subcommands get extra options + match subcommand.as_str() { +- "test" => { opts.optmulti("", "test-args", "extra arguments", "ARGS"); }, ++ "test" => { ++ opts.optflag("", "no-fail-fast", "Run all tests regardless of failure"); ++ opts.optmulti("", "test-args", "extra arguments", "ARGS"); ++ }, + "bench" => { opts.optmulti("", "test-args", "extra arguments", "ARGS"); }, + "dist" => { opts.optflag("", "install", "run installer as well"); }, + _ => { }, +@@ -260,6 +264,7 @@ Arguments: + Subcommand::Test { + paths: paths, + test_args: matches.opt_strs("test-args"), ++ no_fail_fast: matches.opt_present("no-fail-fast"), + } + } + "bench" => { +@@ -335,6 +340,13 @@ impl Subcommand { + _ => Vec::new(), + } + } ++ ++ pub fn no_fail_fast(&self) -> bool { ++ match *self { ++ Subcommand::Test { no_fail_fast, .. } => no_fail_fast, ++ _ => false, ++ } ++ } + } + + fn split(s: Vec) -> Vec { +diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs +index 5e046f41673e..d2303c96d201 100644 +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -76,6 +76,7 @@ extern crate num_cpus; + extern crate rustc_serialize; + extern crate toml; + ++use std::cell::Cell; + use std::cmp; + use std::collections::HashMap; + use std::env; +@@ -85,7 +86,7 @@ use std::io::Read; + use std::path::{Component, PathBuf, Path}; + use std::process::Command; + +-use build_helper::{run_silent, run_suppressed, output, mtime}; ++use build_helper::{run_silent, run_suppressed, try_run_silent, try_run_suppressed, output, mtime}; + + use util::{exe, libdir, add_lib_path}; + +@@ -164,6 +165,7 @@ pub struct Build { + crates: HashMap, + is_sudo: bool, + src_is_git: bool, ++ delayed_failures: Cell, + } + + #[derive(Debug)] +@@ -257,6 +259,7 @@ impl Build { + lldb_python_dir: None, + is_sudo: is_sudo, + src_is_git: src_is_git, ++ delayed_failures: Cell::new(0), + } + } + +@@ -847,6 +850,23 @@ impl Build { + run_suppressed(cmd) + } + ++ /// Runs a command, printing out nice contextual information if it fails. ++ /// Exits if the command failed to execute at all, otherwise returns its ++ /// `status.success()`. ++ fn try_run(&self, cmd: &mut Command) -> bool { ++ self.verbose(&format!("running: {:?}", cmd)); ++ try_run_silent(cmd) ++ } ++ ++ /// Runs a command, printing out nice contextual information if it fails. ++ /// Exits if the command failed to execute at all, otherwise returns its ++ /// `status.success()`. ++ #[allow(unused)] ++ fn try_run_quiet(&self, cmd: &mut Command) -> bool { ++ self.verbose(&format!("running: {:?}", cmd)); ++ try_run_suppressed(cmd) ++ } ++ + /// Prints a message if this build is configured in verbose mode. + fn verbose(&self, msg: &str) { + if self.flags.verbose() || self.config.verbose() { +diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs +index 17902a39df1e..f0522035127c 100644 +--- a/src/bootstrap/step.rs ++++ b/src/bootstrap/step.rs +@@ -28,6 +28,7 @@ + + use std::collections::{BTreeMap, HashSet, HashMap}; + use std::mem; ++use std::process; + + use check::{self, TestKind}; + use compile; +@@ -1092,8 +1093,8 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd? + let (kind, paths) = match self.build.flags.cmd { + Subcommand::Build { ref paths } => (Kind::Build, &paths[..]), + Subcommand::Doc { ref paths } => (Kind::Doc, &paths[..]), +- Subcommand::Test { ref paths, test_args: _ } => (Kind::Test, &paths[..]), +- Subcommand::Bench { ref paths, test_args: _ } => (Kind::Bench, &paths[..]), ++ Subcommand::Test { ref paths, .. } => (Kind::Test, &paths[..]), ++ Subcommand::Bench { ref paths, .. } => (Kind::Bench, &paths[..]), + Subcommand::Dist { ref paths, install } => { + if install { + return vec![self.sbuild.name("install")] +@@ -1191,6 +1192,13 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd? + self.build.verbose(&format!("executing step {:?}", step)); + (self.rules[step.name].run)(step); + } ++ ++ // Check for postponed failures from `test --no-fail-fast`. ++ let failures = self.build.delayed_failures.get(); ++ if failures > 0 { ++ println!("\n{} command(s) did not execute successfully.\n", failures); ++ process::exit(1); ++ } + } + + /// From the top level targets `steps` generate a topological ordering of +diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs +index cb58a916fb79..10b0f19d6274 100644 +--- a/src/build_helper/lib.rs ++++ b/src/build_helper/lib.rs +@@ -42,35 +42,49 @@ pub fn run(cmd: &mut Command) { + } + + pub fn run_silent(cmd: &mut Command) { ++ if !try_run_silent(cmd) { ++ std::process::exit(1); ++ } ++} ++ ++pub fn try_run_silent(cmd: &mut Command) -> bool { + let status = match cmd.status() { + Ok(status) => status, + Err(e) => fail(&format!("failed to execute command: {:?}\nerror: {}", + cmd, e)), + }; + if !status.success() { +- fail(&format!("command did not execute successfully: {:?}\n\ +- expected success, got: {}", +- cmd, +- status)); ++ println!("\n\ncommand did not execute successfully: {:?}\n\ ++ expected success, got: {}\n\n", ++ cmd, ++ status); + } ++ status.success() + } + + pub fn run_suppressed(cmd: &mut Command) { ++ if !try_run_suppressed(cmd) { ++ std::process::exit(1); ++ } ++} ++ ++pub fn try_run_suppressed(cmd: &mut Command) -> bool { + let output = match cmd.output() { + Ok(status) => status, + Err(e) => fail(&format!("failed to execute command: {:?}\nerror: {}", + cmd, e)), + }; + if !output.status.success() { +- fail(&format!("command did not execute successfully: {:?}\n\ +- expected success, got: {}\n\n\ +- stdout ----\n{}\n\ +- stderr ----\n{}\n", +- cmd, +- output.status, +- String::from_utf8_lossy(&output.stdout), +- String::from_utf8_lossy(&output.stderr))); ++ println!("\n\ncommand did not execute successfully: {:?}\n\ ++ expected success, got: {}\n\n\ ++ stdout ----\n{}\n\ ++ stderr ----\n{}\n\n", ++ cmd, ++ output.status, ++ String::from_utf8_lossy(&output.stdout), ++ String::from_utf8_lossy(&output.stderr)); + } ++ output.status.success() + } + + pub fn gnu_target(target: &str) -> String { +-- +2.13.0 + diff --git a/patches/u-skip-main-thread-stack-guard.patch b/patches/u-skip-main-thread-stack-guard.patch new file mode 100644 index 0000000000..e1d88b700c --- /dev/null +++ b/patches/u-skip-main-thread-stack-guard.patch @@ -0,0 +1,75 @@ +commit be509b3387aebb453b09a4942cf902c7d05a0f1e +Author: Josh Stone +Date: Wed Jul 5 12:03:17 2017 -0700 + + Skip the main thread's manual stack guard on Linux + + Linux doesn't allocate the whole stack right away, and the kernel has + its own stack-guard mechanism to fault when growing too close to an + existing mapping. If we map our own guard, then the kernel starts + enforcing a rather large gap above that, rendering much of the possible + stack space useless. + + Instead, we'll just note where we expect rlimit to start faulting, so + our handler can report "stack overflow", and trust that the kernel's own + stack guard will work. + + Fixes #43052. + +diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs +index 1642baa34d..1574774661 100644 +--- a/src/libstd/sys/unix/thread.rs ++++ b/src/libstd/sys/unix/thread.rs +@@ -264,23 +264,37 @@ pub mod guard { + as *mut libc::c_void; + } + +- // Rellocate the last page of the stack. +- // This ensures SIGBUS will be raised on +- // stack overflow. +- let result = mmap(stackaddr, psize, PROT_NONE, +- MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0); +- +- if result != stackaddr || result == MAP_FAILED { +- panic!("failed to allocate a guard page"); +- } +- +- let offset = if cfg!(any(target_os = "linux", target_os = "freebsd")) { +- 2 ++ if cfg!(target_os = "linux") { ++ // Linux doesn't allocate the whole stack right away, and ++ // the kernel has its own stack-guard mechanism to fault ++ // when growing too close to an existing mapping. If we map ++ // our own guard, then the kernel starts enforcing a rather ++ // large gap above that, rendering much of the possible ++ // stack space useless. See #43052. ++ // ++ // Instead, we'll just note where we expect rlimit to start ++ // faulting, so our handler can report "stack overflow", and ++ // trust that the kernel's own stack guard will work. ++ Some(stackaddr as usize) + } else { +- 1 +- }; ++ // Reallocate the last page of the stack. ++ // This ensures SIGBUS will be raised on ++ // stack overflow. ++ let result = mmap(stackaddr, psize, PROT_NONE, ++ MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0); ++ ++ if result != stackaddr || result == MAP_FAILED { ++ panic!("failed to allocate a guard page"); ++ } + +- Some(stackaddr as usize + offset * psize) ++ let offset = if cfg!(target_os = "freebsd") { ++ 2 ++ } else { ++ 1 ++ }; ++ ++ Some(stackaddr as usize + offset * psize) ++ } + } + + #[cfg(target_os = "solaris")] diff --git a/patches/u-workaround-testfailure-armhf_01.patch b/patches/u-workaround-testfailure-armhf_01.patch new file mode 100644 index 0000000000..bf6e950435 --- /dev/null +++ b/patches/u-workaround-testfailure-armhf_01.patch @@ -0,0 +1,48 @@ +Description: FIN: disable backtrace printing for panic-runtime/abort* on ARM + On Debian we run tests with RUST_BACKTRACE=1, triggering the underlying bug. +Author: Tim Neumann +Date: Sun Apr 2 11:24:22 2017 +0200 +Bug: https://github.com/rust-lang/rust/issues/41004 +Applied-Upstream: commit:a146431e4c8095a3d809517c8abc6b886d5c5b07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs ++++ b/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs +@@ -27,7 +27,17 @@ + exit_success_if_unwind::bar(do_panic); + } + } +- let s = Command::new(env::args_os().next().unwrap()).arg("foo").status(); ++ ++ let mut cmd = Command::new(env::args_os().next().unwrap()); ++ cmd.arg("foo"); ++ ++ ++ // ARMv6 hanges while printing the backtrace, see #41004 ++ if cfg!(target_arch = "arm") && cfg!(target_env = "gnu") { ++ cmd.env("RUST_BACKTRACE", "0"); ++ } ++ ++ let s = cmd.status(); + assert!(s.unwrap().code() != Some(0)); + } + +--- a/src/test/run-pass/panic-runtime/abort.rs ++++ b/src/test/run-pass/panic-runtime/abort.rs +@@ -35,6 +35,15 @@ + panic!("try to catch me"); + } + } +- let s = Command::new(env::args_os().next().unwrap()).arg("foo").status(); ++ ++ let mut cmd = Command::new(env::args_os().next().unwrap()); ++ cmd.arg("foo"); ++ ++ // ARMv6 hanges while printing the backtrace, see #41004 ++ if cfg!(target_arch = "arm") && cfg!(target_env = "gnu") { ++ cmd.env("RUST_BACKTRACE", "0"); ++ } ++ ++ let s = cmd.status(); + assert!(s.unwrap().code() != Some(0)); + } diff --git a/rules b/rules new file mode 100755 index 0000000000..efc13937f9 --- /dev/null +++ b/rules @@ -0,0 +1,287 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/vendor.mk +include /usr/share/dpkg/architecture.mk +include /usr/share/dpkg/buildflags.mk +# TODO: more correct to use `[build] rustflags = []` list syntax in Cargo.toml +RUSTFLAGS = $(addprefix -C link-args=,$(LDFLAGS)) +export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS RUSTFLAGS + +# Defines DEB_*_RUST_TYPE triples +include debian/architecture.mk +export DEB_HOST_RUST_TYPE + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# src/rt/miniz.c (incorrectly) triggers -Wmisleading-indentation with +# gcc-6. See bug #811573. +CFLAGS += -Wno-misleading-indentation + +# Release type (one of beta, stable or nightly) +RELEASE_CHANNEL := stable +# See also ./build-preview-dsc.sh for a script that builds a beta/nightly .dsc +# out of this packaging. Furthermore, if the build breaks after importing a new +# upstream stable release, check the do_temporary_fixup function in that file +# to see if we already know what fix to make. + +DEB_DESTDIR := $(CURDIR)/debian/tmp + +SED_VERSION_SHORT := sed -re 's/([^.]+)\.([^.]+)\..*/\1.\2/' +RUST_VERSION := $(shell echo '$(DEB_VERSION_UPSTREAM)' | $(SED_VERSION_SHORT)) +RUST_LONG_VERSION := $(shell echo '$(DEB_VERSION_UPSTREAM)' | sed -re 's/([^+]+).*/\1/') +LIBSTD_PKG := libstd-rust-$(RUST_VERSION) +# Sed expression that matches the "rustc" we have in our Build-Depends field +SED_RUSTC_BUILDDEP := sed -ne "/^Build-Depends:/,/^[^[:space:]\#]/{/^ *rustc:native .*,/p}" debian/control + +# 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. +# 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) --disable-debuginfo-only-std + +# 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 --on-fail env +# To run a specific test, run something like: +# $ debian/rules override_dh_auto_test-arch \ +# RUSTBUILD_TEST_FLAGS="src/test/run-make --test-args extern-fn-struct" +# See src/bootstrap/README.md for more options. +RUSTBUILD_TEST_FLAGS = + +update-version: + oldver=$(shell $(SED_RUSTC_BUILDDEP) | sed -ne 's/.*(<= \(.*\)).*/\1/gp' | $(SED_VERSION_SHORT)); \ + newver=$(RUST_VERSION); \ + if [ $$oldver != $$newver ]; then debian/update-version.sh $$oldver $$newver; fi + +# Below we detect how we're supposed to bootstrap the stage0 compiler. See +# README.Debian for more details of the cases described below. +# +PRECONFIGURE_CHECK = : +HAVE_BINARY_TARBALL := $(shell ls -1 stage0/*/*$(DEB_HOST_RUST_TYPE)* 2>/dev/null | wc -l) +# allow not using the binary tarball although it exists +#ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 powerpc ppc64el s390x)) +# HAVE_BINARY_TARBALL := 0 +#endif +ifeq (0,$(HAVE_BINARY_TARBALL)) + # Case A (Building from source): the extracted source tree does not include + # a bootstrapping tarball for the current architecture e.g. because the + # distro already has a rustc for this arch, or the uploader expects that + # this requirement be fulfilled in some other way. + # + # Case A-1: the builder did not select the "pkg.rustc.dlstage0" build profile. + # In this case, we use the distro's rustc - either the previous or current version. + ifeq (,$(findstring pkg.rustc.dlstage0,$(DEB_BUILD_PROFILES))) + DEB_CONFIGURE_FLAGS += --enable-local-rust --local-rust-root=/usr + endif + # + # Case A-2: the builder selected the "dlstage0" build profile. + # In this case, the rust build scripts will download a stage0 into stage0/ and use that. + # We don't need to do anything specific in this build file, so this case is empty. +else + # Case B (Bootstrapping a new distro): the extracted source tree does + # include a bootstrapping tarball for the current architecture; see the + # `source_orig-stage0` target below on how to build this. + # + # In this case, we'll bootstrap from the stage0 given in that tarball. + # To ensure the uploader of the .dsc didn't make a mistake, we first check + # that rustc isn't a Build-Depends for the current architecture. + ifneq (,$(shell $(SED_RUSTC_BUILDDEP))) + ifeq (,$(shell $(SED_RUSTC_BUILDDEP) | grep '!$(DEB_HOST_ARCH)')) + PRECONFIGURE_CHECK = $(error found matches for stage0/*/*$(DEB_HOST_RUST_TYPE)*, \ + but rustc might be a Build-Depends for $(DEB_HOST_ARCH)) + endif + endif +endif + +BUILD_DOCS = 1 +ifneq (,$(findstring nodoc,$(DEB_BUILD_PROFILES))) + DEB_CONFIGURE_FLAGS += --disable-docs + BUILD_DOCS = +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEB_CONFIGURE_FLAGS += --disable-optimize --disable-optimize-cxx --disable-optimize-llvm +endif + +# Build products or non-source files in src/, that shouldn't go in rust-src +SRC_CLEAN = src/rt/hoedown/src/html_blocks.c \ + src/bootstrap/bootstrap.pyc \ + src/etc/__pycache__/ + +# Workaround for linux #865549 +ifeq (0,$(shell test $$(uname -s) = "Linux" -a $$(getconf PAGESIZE) -gt 4096; echo $$?)) + SYSTEM_WORKAROUNDS += ulimit -s $$(expr $$(getconf PAGESIZE) / 1024 '*' 256 + 8192); +endif + +%: + $(SYSTEM_WORKAROUNDS) dh $@ --parallel + +.PHONY: build +build: + $(SYSTEM_WORKAROUNDS) dh $@ --parallel + +debian/config.toml: debian/config.toml.in + m4 -DDEB_BUILD_RUST_TYPE="$(DEB_BUILD_RUST_TYPE)" \ + -DDEB_HOST_RUST_TYPE="$(DEB_HOST_RUST_TYPE)" \ + -DDEB_TARGET_RUST_TYPE="$(DEB_TARGET_RUST_TYPE)" \ + -DRELEASE_CHANNEL="$(RELEASE_CHANNEL)" \ + "$<" > "$@" + +override_dh_auto_configure: debian/config.toml + # fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog + ! grep --color=always -i 'll...?$(OLD_LLVM_VERSION)' --exclude=changelog -R debian + $(PRECONFIGURE_CHECK) + if [ -d stage0 ]; then mkdir -p build && ln -sfT ../stage0 build/cache; fi + # work around #842634 + if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \ + debian/ensure-patch -N debian/patches/d-host-duplicates.patch; fi + PATH="$$PWD/debian/bin:$$PATH" \ + ./configure $(DEB_CONFIGURE_FLAGS) + +override_dh_auto_clean: + $(RM) -rf ./build ./tmp ./.cargo config.stamp config.mk Makefile + $(RM) -rf $(SRC_CLEAN) debian/config.toml + +# upstream bundles this in the source, but in Debian we rebuild everything yo +generate-sources: + $(MAKE) -C src/rt/hoedown src/html_blocks.c + +override_dh_auto_build-arch: generate-sources + $(RUSTBUILD) build $(RUSTBUILD_FLAGS) + +# note: this is only for buildds that want to do a separate arch:all build; +# there is no point running this yourself "to save time" since it implicitly +# depends on build-arch anyways. +override_dh_auto_build-indep: generate-sources +ifneq (,$(BUILD_DOCS)) +# Rust has a weird way of configuring whether to build docs or not + sed -i -e 's/^docs = false/docs = true/' debian/config.toml + $(RUSTBUILD) doc $(RUSTBUILD_FLAGS) +endif + +RUN_TESTS = \ + if $(1); then \ + : ; \ + elif [ $(DEB_VENDOR) = "Debian" -a $(DEB_DISTRIBUTION) != "experimental" ]; then \ + false; \ + elif [ $(DEB_VENDOR) = "Ubuntu" -a $(DEB_HOST_ARCH) != "s390x" ]; then \ + false ; \ + else \ + echo "====================================================="; \ + echo "WARNING: Ignoring test failures in the rust testsuite"; \ + echo "====================================================="; \ + fi + +override_dh_auto_test-arch: +# ensure that rustc_llvm is actually dynamically linked to libLLVM + set -e; find build/*/stage2/lib/rustlib/* -name '*rustc_llvm*.so' | \ + while read x; do \ + stat -c '%s %n' "$$x"; \ + objdump -p "$$x" | grep -q "NEEDED.*LLVM"; \ + test "$$(stat -c %s "$$x")" -lt 6000000; \ + done +ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(call RUN_TESTS,RUST_BACKTRACE=1 $(RUSTBUILD) test --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS)) +# don't continue if RUSTBUILD_TEST_FLAGS is non-empty + test -z "$(RUSTBUILD_TEST_FLAGS)" +endif + +override_dh_auto_test-indep: +ifneq (,$(BUILD_DOCS)) +ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) + # Run all rules that test the docs, i.e. in step.rs that depend on default:doc + $(call RUN_TESTS,RUST_BACKTRACE=1 $(RUSTBUILD) test --no-fail-fast src/tools/linkchecker $(RUSTBUILD_FLAGS)) +endif +endif + +override_dh_auto_install: + DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) dist $(RUSTBUILD_FLAGS) --install + + mkdir -p $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ + mv $(DEB_DESTDIR)/usr/lib/lib*.so $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ + + # Replace duplicated compile-time/run-time dylibs with symlinks + @set -e; \ + for f in $(DEB_DESTDIR)/usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/lib/lib*.so; do \ + name=$${f##*/}; \ + if [ -f "$(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/$$name" ]; then \ + echo "ln -sf ../../../$(DEB_HOST_MULTIARCH)/$$name $$f"; \ + ln -sf ../../../$(DEB_HOST_MULTIARCH)/$$name $$f; \ + fi; \ + done + +ifneq (,$(BUILD_DOCS)) + # Brute force to remove privacy-breach-logo lintian warning. + # We could have updated the upstream sources but it would complexify + # the rebase + @set -e; \ + find $(DEB_DESTDIR)/usr/share/doc/rust/html -iname '*.html' | \ + while read file; do \ + topdir=$$(echo "$$file" | sed 's,^$(DEB_DESTDIR)/usr/share/doc/rust/html/,,; s,/[^/]*$$,/,; s,^[^/]*$$,,; s,[^/]\+/,../,g'); \ + sed -i -e "s,https://doc.rust-lang.org/\(favicon.ico\|logos/rust-logo-32x32-blk.png\),$${topdir}rust-logo-32x32-blk.png," \ + -e "s,https://www.rust-lang.org/\(favicon.ico\|logos/rust-logo-32x32-blk.png\),$${topdir}rust-logo-32x32-blk.png," "$$file"; \ + done + find $(DEB_DESTDIR) \( -iname '*.html' -empty -o -name .lock -o -name '*.inc' \) -delete; +endif + +override_dh_install-arch: + dh_install + dh_install -p$(LIBSTD_PKG) usr/lib/$(DEB_HOST_MULTIARCH)/ + +override_dh_install-indep: + dh_install + chmod -x \ + debian/rust-gdb/usr/share/rust-gdb/*.py \ + debian/rust-lldb/usr/share/rust-lldb/*.py + $(RM) -rf $(SRC_CLEAN:%=debian/rust-src/usr/src/rust/%) + # Get rid of lintian warnings + find debian/rust-src/usr/src/rust \ + \( -name .gitignore \ + -o -name 'LICENSE*' \ + -o -name 'LICENCE' \ + -o -name 'license' \ + -o -name 'COPYING*' \ + \) -delete + cd debian/rust-src/usr/src/rust && chmod -x \ + src/etc/gdb_rust_pretty_printing.py \ + src/etc/adb_run_wrapper.sh \ + src/compiler-rt/test/builtins/Unit/ppc/test + +override_dh_installchangelogs: + dh_installchangelogs RELEASES.md + +override_dh_installdocs: + dh_installdocs -X.tex -X.aux -X.log -X.out -X.toc + +override_dh_compress: + dh_compress -X.woff + +override_dh_makeshlibs: + dh_makeshlibs -V + + # dh_makeshlibs doesn't support our "libfoo-version.so" naming + # structure, so we have to do this ourselves. + install -o 0 -g 0 -d debian/$(LIBSTD_PKG)/DEBIAN + LC_ALL=C ls debian/$(LIBSTD_PKG)/usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so | \ + sed -n 's,^.*/\(lib.*\)-\(.\+\)\.so$$,\1 \2,p' | \ + while read name version; do \ + echo "$$name $$version $(LIBSTD_PKG) (>= $(DEB_VERSION_UPSTREAM))"; \ + done > debian/$(LIBSTD_PKG)/DEBIAN/shlibs + chmod 644 debian/$(LIBSTD_PKG)/DEBIAN/shlibs + chown 0:0 debian/$(LIBSTD_PKG)/DEBIAN/shlibs + +override_dh_shlibdeps: + dh_shlibdeps -- -x$(LIBSTD_PKG) + +QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE = x=$$?; if [ $$x = 2 ]; then exit 0; else exit $$x; fi +source_orig-stage0: + QUILT_PATCHES=debian/patches quilt push -aq; $(QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE) + $(MAKE) -f debian/rules clean + debian/make_orig-stage0_tarball.sh + QUILT_PATCHES=debian/patches quilt pop -aq; $(QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE) + rm -rf .pc diff --git a/rust-doc.doc-base.book b/rust-doc.doc-base.book new file mode 100644 index 0000000000..08ddd4d926 --- /dev/null +++ b/rust-doc.doc-base.book @@ -0,0 +1,12 @@ +Document: rust-book +Title: The Rust Programming Language +Section: Programming/Rust +Abstract: + This book will teach you about the Rust Programming Language. Rust is + a modern systems programming language focusing on safety and speed. It + accomplishes these goals by being memory safe without using garbage + collection. + +Format: HTML +Index: /usr/share/doc/rust-doc/html/book/index.html +Files: /usr/share/doc/rust-doc/html/book/*.html diff --git a/rust-doc.doc-base.intro b/rust-doc.doc-base.intro new file mode 100644 index 0000000000..270cce73b3 --- /dev/null +++ b/rust-doc.doc-base.intro @@ -0,0 +1,10 @@ +Document: rust-intro +Title: The Rust Guide +Section: Programming/Rust +Abstract: + This introduction will give you a rough idea of what Rust is like, + eliding many details. + +Format: HTML +Index: /usr/share/doc/rust-doc/html/intro.html +Files: /usr/share/doc/rust-doc/html/intro.html diff --git a/rust-doc.doc-base.reference b/rust-doc.doc-base.reference new file mode 100644 index 0000000000..e1909c83f6 --- /dev/null +++ b/rust-doc.doc-base.reference @@ -0,0 +1,10 @@ +Document: rust-reference +Title: The Rust Reference +Section: Programming/Rust +Abstract: + This document is the primary reference for the Rust programming + language. + +Format: HTML +Index: /usr/share/doc/rust-doc/html/reference.html +Files: /usr/share/doc/rust-doc/html/reference.html diff --git a/rust-doc.docs b/rust-doc.docs new file mode 100644 index 0000000000..5a0e189bd9 --- /dev/null +++ b/rust-doc.docs @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/rust/html diff --git a/rust-doc.install b/rust-doc.install new file mode 100644 index 0000000000..de6024b0c7 --- /dev/null +++ b/rust-doc.install @@ -0,0 +1 @@ +debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/ diff --git a/rust-doc.links b/rust-doc.links new file mode 100644 index 0000000000..6c9e55cee8 --- /dev/null +++ b/rust-doc.links @@ -0,0 +1,9 @@ +# This should eventually become part of a dh_rustdoc program. +# Something that does e.g. +# find $(DESTDIR) -name jquery.js -execdir ln -sf -T \ +# /usr/share/doc/rust-doc/html/jquery.js '{}' \; +usr/share/javascript/jquery/jquery.min.js usr/share/doc/rust-doc/html/jquery.js +usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/doc/rust-doc/html/fonts-font-awesome.min.css +usr/share/javascript/mathjax usr/share/doc/rust-doc/html/mathjax +usr/share/javascript/highlight.js/styles/atelier-dune.light.css usr/share/doc/rust-doc/html/highlight.css +usr/share/javascript/highlight.js/highlight.js usr/share/doc/rust-doc/html/highlight.js diff --git a/rust-gdb.install b/rust-gdb.install new file mode 100644 index 0000000000..d274b0bf0d --- /dev/null +++ b/rust-gdb.install @@ -0,0 +1,3 @@ +src/etc/rust-gdb usr/bin/ +src/etc/gdb_*.py usr/share/rust-gdb/ +src/etc/debugger_pretty_printers_common.py usr/share/rust-gdb/ diff --git a/rust-gdb.links b/rust-gdb.links new file mode 100644 index 0000000000..51b82a4b7c --- /dev/null +++ b/rust-gdb.links @@ -0,0 +1 @@ +usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz diff --git a/rust-lldb.install b/rust-lldb.install new file mode 100644 index 0000000000..a48bbb6846 --- /dev/null +++ b/rust-lldb.install @@ -0,0 +1,3 @@ +src/etc/rust-lldb usr/bin/ +src/etc/lldb_rust_formatters.py usr/share/rust-lldb/ +src/etc/debugger_pretty_printers_common.py usr/share/rust-lldb/ diff --git a/rust-lldb.links b/rust-lldb.links new file mode 100644 index 0000000000..dbed47e356 --- /dev/null +++ b/rust-lldb.links @@ -0,0 +1 @@ +usr/share/man/man1/lldb-3.9.1.gz usr/share/man/man1/rust-lldb.1.gz diff --git a/rust-src.install b/rust-src.install new file mode 100644 index 0000000000..0be9805c86 --- /dev/null +++ b/rust-src.install @@ -0,0 +1,11 @@ +# from src/bootstrap/dist.rs:370 onwards +COPYRIGHT usr/src/rust +LICENSE-APACHE usr/src/rust +LICENSE-MIT usr/src/rust +CONTRIBUTING.md usr/src/rust +README.md usr/src/rust +RELEASES.md usr/src/rust +configure usr/src/rust +x.py usr/src/rust +man usr/src/rust +src usr/src/rust diff --git a/rust-src.links b/rust-src.links new file mode 100644 index 0000000000..1a3314e374 --- /dev/null +++ b/rust-src.links @@ -0,0 +1 @@ +usr/src/rust usr/lib/rustlib/src/rust diff --git a/rustc.install b/rustc.install new file mode 100644 index 0000000000..c289154d74 --- /dev/null +++ b/rustc.install @@ -0,0 +1,3 @@ +usr/bin/rustc +usr/bin/rustdoc +debian/architecture.mk usr/share/rustc/ diff --git a/rustc.manpages b/rustc.manpages new file mode 100644 index 0000000000..f153792b9d --- /dev/null +++ b/rustc.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man1/rustc.1 +debian/tmp/usr/share/man/man1/rustdoc.1 + diff --git a/source/format b/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/include-binaries b/source/include-binaries new file mode 100644 index 0000000000..33bec95225 --- /dev/null +++ b/source/include-binaries @@ -0,0 +1,6 @@ +debian/icons/rust-logo-32x32-blk.png +# if you are here because dpkg-source told you to "add stage0/rustc-** in d/source/include-binaries", +# ignore that instruction and instead: +# a) if you want to use the orig-stage0 for your next upload, then extract it into stage0/ +# b) if you don't want to use it, then rename "../rustc_${version}.orig-stage0.tar.xz" to something else +# see also d/source/options and d/source/local-options and #577113. diff --git a/source/options b/source/options new file mode 100644 index 0000000000..8a8c93f546 --- /dev/null +++ b/source/options @@ -0,0 +1,4 @@ +# this helps to prevent accidentally including the orig-stage0 tarball in a non +# orig-stage0 upload, after running `debian/rules source_orig-stage0`. +# we can get rid of this after #577113 is fixed +include-removal diff --git a/update-version.sh b/update-version.sh new file mode 100755 index 0000000000..2e44289e5a --- /dev/null +++ b/update-version.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Don't run this directly, use "debian/rules update-version" instead + +prev_stable() { +local V=$1 +python -c 'import sys; k=map(int,sys.argv[1].split(".")); k[1]-=1; print ".".join(map(str,k))' "$V" +} + +update() { +local ORIG=$1 NEW=$2 + +ORIG_M1=$(prev_stable $ORIG) +NEW_M1=$(prev_stable $NEW) +ORIG_R="${ORIG/./\\.}" # match a literal dot, otherwise this might sometimes match e.g. debhelper (>= 9.20141010) + +sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" \ + -e "s|rustc:native\( *\)(<= ${ORIG_R}|rustc\1(<= $NEW|g" \ + -e "s|rustc:native\( *\)(>= ${ORIG_M1/./\\.}|rustc\1(>= ${NEW_M1}|g" control + +git mv libstd-rust-$ORIG.lintian-overrides libstd-rust-$NEW.lintian-overrides +sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" libstd-rust-$NEW.lintian-overrides +} + +cd $(dirname "$0") +update "$1" "$2" diff --git a/upstream/signing-key.asc b/upstream/signing-key.asc new file mode 100644 index 0000000000..93e2282c7a --- /dev/null +++ b/upstream/signing-key.asc @@ -0,0 +1,86 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFJEwMkBEADlPACa2K7reD4x5zd8afKx75QYKmxqZwywRbgeICeD4bKiQoJZ +dUjmn1LgrGaXuBMKXJQhyA34e/1YZel/8et+HPE5XpljBfNYXWbVocE1UMUTnFU9 +CKXa4AhJ33f7we2/QmNRMUifw5adPwGMg4D8cDKXk02NdnqQlmFByv0vSaArR5kn +gZKnLY6o0zZ9Buyy761Im/ShXqv4ATUgYiFc48z33G4j+BDmn0ryGr1aFdP58tHp +gjWtLZs0iWeFNRDYDje6ODyu/MjOyuAWb2pYDH47Xu7XedMZzenH2TLM9yt/hyOV +xReDPhvoGkaO8xqHioJMoPQi1gBjuBeewmFyTSPS4deASukhCFOcTsw/enzJagiS +ZAq6Imehduke+peAL1z4PuRmzDPO2LPhVS7CDXtuKAYqUV2YakTq8MZUempVhw5n +LqVaJ5/XiyOcv405PnkT25eIVVVghxAgyz6bOU/UMjGQYlkUxI7YZ9tdreLlFyPR +OUL30E8q/aCd4PGJV24yJ1uit+yS8xjyUiMKm4J7oMP2XdBN98TUfLGw7SKeAxyU +92BHlxg7yyPfI4TglsCzoSgEIV6xoGOVRRCYlGzSjUfz0bCMCclhTQRBkegKcjB3 +sMTyG3SPZbjTlCqrFHy13e6hGl37Nhs8/MvXUysq2cluEISn5bivTKEeeQARAQAB +tERSdXN0IExhbmd1YWdlIChUYWcgYW5kIFJlbGVhc2UgU2lnbmluZyBLZXkpIDxy +dXN0LWtleUBydXN0LWxhbmcub3JnPokCOAQTAQIAIgUCUkTAyQIbAwYLCQgHAwIG +FQgCCQoLBBYCAwECHgECF4AACgkQhauW5vob5f5fYQ//b1DWK1NSGx5nZ3zYZeHJ +9mwGCftIaA2IRghAGrNf4Y8DaPqR+w1OdIegWn8kCoGfPfGAVW5XXJg+Oxk6QIaD +2hJojBUrq1DALeCZVewzTVw6BN4DGuUexsc53a8DcY2Yk5WE3ll6UKq/YPiWiPNX +9r8FE2MJwMABB6mWZLqJeg4RCrriBiCG26NZxGE7RTtPHyppoVxWKAFDiWyNdJ+3 +UnjldWrT9xFqjqfXWw9Bhz8/EoaGeSSbMIAQDkQQpp1SWpljpgqvctZlc5fHhsG6 +lmzW5RM4NG8OKvq3UrBihvgzwrIfoEDKpXbk3DXqaSs1o81NH5ftVWWbJp/ywM9Q +uMC6n0YWiMZMQ1cFBy7tukpMkd+VPbPkiSwBhPkfZIzUAWd74nanN5SKBtcnymgJ ++OJcxfZLiUkXRj0aUT1GLA9/7wnikhJI+RvwRfHBgrssXBKNPOfXGWajtIAmZc2t +kR1E8zjBVLId7r5M8g52HKk+J+y5fVgJY91nxG0zf782JjtYuz9+knQd55JLFJCO +hhbv3uRvhvkqgauHagR5X9vCMtcvqDseK7LXrRaOdOUDrK/Zg/abi5d+NIyZfEt/ +ObFsv3idAIe/zpU6xa1nYNe3+Ixlb6mlZm3WCWGxWe+GvNW/kq36jZ/v/8pYMyVO +p/kJqnf9y4dbufuYBg+RLqC5Ag0EUkTAyQEQANxy2tTSeRspfrpBk9+ju+KZ3zc4 +umaIsEa5DxJ2zIKHywVAR67Um0K1YRG07/F5+tD9TIRkdx2pcmpjmSQzqdk3zqa9 +2Zzeijjz2RNyBY8qYmyE08IncjTsFFB8OnvdXcsAgjCFmI1BKnePxrABL/2k8X18 +aysPb0beWqQVsi5FsSpAHu6k1kaLKc+130x6Hf/YJAjeo+S7HeU5NeOz3zD+h5bA +Q25qMiVHX3FwH7rFKZtFFog9Ogjzi0TkDKKxoeFKyADfIdteJWFjOlCI9KoIhfXq +Et9JMnxApGqsJElJtfQjIdhMN4Lnep2WkudHAfwJ/412fe7wiW0rcBMvr/BlBGRY +vM4sTgN058EwIuY9Qmc8RK4gbBf6GsfGNJjWozJ5XmXElmkQCAvbQFoAfi5TGfVb +77QQrhrQlSpfIYrvfpvjYoqj618SbU6uBhzh758gLllmMB8LOhxWtq9eyn1rMWyR +KL1fEkfvvMc78zP+Px6yDMa6UIez8jZXQ87Zou9EriLbzF4QfIYAqR9LUSMnLk6K +o61tSFmFEDobC3tc1jkSg4zZe/wxskn96KOlmnxgMGO0vJ7ASrynoxEnQE8k3WwA ++/YJDwboIR7zDwTy3Jw3mn1FgnH+c7Rb9h9geOzxKYINBFz5Hd0MKx7kZ1U6WobW +KiYYxcCmoEeguSPHABEBAAGJAh8EGAECAAkFAlJEwMkCGwwACgkQhauW5vob5f7f +FA//Ra+itJF4NsEyyhx4xYDOPq4uj0VWVjLdabDvFjQtbBLwIyh2bm8uO3AY4r/r +rM5WWQ8oIXQ2vvXpAQO9g8iNlFez6OLzbfdSG80AG74pQqVVVyCQxD7FanB/KGge +tAoOstFxaCAg4nxFlarMctFqOOXCFkylWl504JVIOvgbbbyj6I7qCUmbmqazBSMU +K8c/Nz+FNu2Uf/lYWOeGogRSBgS0CVBcbmPUpnDHLxZWNXDWQOCxbhA1Uf58hcyu +036kkiWHh2OGgJqlo2WIraPXx1cGw1Ey+U6exbtrZfE5kM9pZzRG7ZY83CXpYWMp +kyVXNWmf9JcIWWBrXvJmMi0FDvtgg3Pt1tnoxqdilk6yhieFc8LqBn6CZgFUBk0t +NSaWk3PsN0N6Ut8VXY6sai7MJ0Gih1gE1xadWj2zfZ9sLGyt2jZ6wK++U881YeXA +ryaGKJ8sIs182hwQb4qN7eiUHzLtIh8oVBHo8Q4BJSat88E5/gOD6IQIpxc42iRL +T+oNZw1hdwNyPOT1GMkkn86l3o7klwmQUWCPm6vl1aHp3omo+GHC63PpNFO5RncJ +Ilo3aBKKmoE5lDSMGE8KFso5awTo9z9QnVPkRsk6qeBYit9xE3x3S+iwjcSg0nie +aAkc0N00nc9V9jfPvt4z/5A5vjHh+NhFwH5h2vBJVPdsz6m5Ag0EVI9keAEQAL3R +oVsHncJTmjHfBOV4JJsvCum4DuJDZ/rDdxauGcjMUWZaG338ZehnDqG1Yn/ys7zE +aKYUmqyT+XP+M2IAQRTyxwlU1RsDlemQfWrESfZQCCmbnFScL0E7cBzy4xvtInQe +UaFgJZ1BmxbzQrx+eBBdOTDv7RLnNVygRmMzmkDhxO1IGEu1+3ETIg/DxFE7VQY0 +It/Ywz+nHu1o4Hemc/GdKxu9hcYvcRVc/Xhueq/zcIM96l0m+CFbs0HMKCj8dgMe +Ng6pbbDjNM+cV+5BgpRdIpE2l9W7ImpbLihqcZt47J6oWt/RDRVoKOzRxjhULVyV +2VP9ESr48HnbvxcpvUAEDCQUhsGpur4EKHFJ9AmQ4zf91gWLrDc6QmlACn9o9ARU +fOV5aFsZI9ni1MJEInJTP37stz/uDECRie4LTL4O6P4Dkto8ROM2wzZq5CiRNfnT +PP7ARfxlCkpg+gpLYRlxGUvRn6EeYwDtiMQJUQPfpGHSvThUlgDEsDrpp4SQSmdA +CB+rvaRqCawWKoXs0In/9wylGorRUupeqGC0I0/rh+f5mayFvORzwy/4KK4QIEV9 +aYTXTvSRl35MevfXU1Cumlaqle6SDkLr3ZnFQgJBqap0Y+Nmmz2HfO/pohsbtHPX +92SN3dKqaoSBvzNGY5WT3CsqxDtik37kR3f9/DHpABEBAAGJBD4EGAECAAkFAlSP +ZHgCGwICKQkQhauW5vob5f7BXSAEGQECAAYFAlSPZHgACgkQXLSpNHs7CdwemA/+ +KFoGuFqU0uKT9qblN4ugRyil5itmTRVffl4tm5OoWkW8uDnu7Ue3vzdzy+9NV8X2 +wRG835qjXijWP++AGuxgW6LB9nV5OWiKMCHOWnUjJQ6pNQMAgSN69QzkFXVF/q5f +bkma9TgSbwjrVMyPzLSRwq7HsT3V02Qfr4cyq39QeILGy/NHW5z6LZnBy3BaVSd0 +lGjCEc3yfH5OaB79na4W86WCV5n4IT7cojFM+LdL6P46RgmEtWSG3/CDjnJl6BLR +WqatRNBWLIMKMpn+YvOOL9TwuP1xbqWr1vZ66wksm53NIDcWhptpp0KEuzbU0/Dt +OltBhcX8tOmO36LrSadX9rwckSETCVYklmpAHNxPml011YNDThtBidvsicw1vZwR +HsXn+txlL6RAIRN+J/Rw3uOiJAqN9Qgedpx2q+E15t8MiTg/FXtB9SysnskFT/BH +z0USNKJUY0btZBw3eXWzUnZf59D8VW1M/9JwznCHAx0c9wy/gRDiwt9w4RoXryJD +VAwZg8rwByjldoiThUJhkCYvJ0R3xH3kPnPlGXDW49E9R8C2umRC3cYOL4U9dOQ1 +5hSlYydF5urFGCLIvodtE9q80uhpyt8L/5jj9tbwZWv6JLnfBquZSnCGqFZRfXlb +Jphk9+CBQWwiZSRLZRzqQ4ffl4xyLuolx01PMaatkQbRaw/+JpgRNlurKQ0PsTrO +8tztO/tpBBj/huc2DGkSwEWvkfWElS5RLDKdoMVs/j5CLYUJzZVikUJRm7m7b+OA +P3W1nbDhuID+XV1CSBmGifQwpoPTys21stTIGLgznJrIfE5moFviOLqD/LrcYlsq +CQg0yleu7SjOs//8dM3mC2FyLaE/dCZ8l2DCLhHw0+ynyRAvSK6aGCmZz6jMjmYF +MXgiy7zESksMnVFMulIJJhR3eB0wx2GitibjY/ZhQ7tD3i0yy9ILR07dFz4pgkVM +afxpVR7fmrMZ0t+yENd+9qzyAZs0ksxORoc2ze90SCx2jwEX/3K+m4I0hP2H/w5W +gqdvuRLiqf+4BGW4zqWkLLlNIe/okt0r82SwHtDN0Ui1asmZTGj6sm8SXtwx+5cE +38MttWqjDiibQOSthRVcETByRYM8KcjYSUCi4PoBc3NpDONkFbZm6XofR/f5mTcl +2jDw6fIeVc4Hd1jBGajNzEqtneqqbdAkPQaLsuD2TMkQfTDJfE/IljwjrhDa9Mi+ +odtnMWq8vlwOZZ24/8/BNK5qXuCYL67O7AJB4ZQ6BT+g4z96iRLbupzu/XJyXkQF +rOY/Ghegvn7fDrnt2KC9MpgeFBXzUp+k5rzUdF8jbCx5apVjA1sWXB9Kh3L+DUwF +Mve696B5tlHyc1KxjHR6w9GRsh4= +=5FXw +-----END PGP PUBLIC KEY BLOCK----- diff --git a/watch b/watch new file mode 100644 index 0000000000..484170d989 --- /dev/null +++ b/watch @@ -0,0 +1,12 @@ +version=4 + +opts="\ +pgpsigurlmangle=s/$/.asc/,\ +uversionmangle=s/(\d)[_.+-]?((beta|alpha)\.?\d*)$/$1~$2/,\ +dversionmangle=s/\+dfsg\d*$//,\ +repack,\ +repacksuffix=+dfsg1,\ +compression=xz,\ +" \ + https://www.rust-lang.org/en-US/other-installers.html \ + (?:.*/)rustc?-(\d[\d.]*(?:-[\w.]+)?)-src\.tar\.gz