Commit Graph

42 Commits

Author SHA1 Message Date
Sylvestre Ledru
9d09010545 Replace two more occurrences of jquery by the package 2015-05-06 11:15:38 +02:00
Angus Lees
2e97839d6b override_dh_install: Use make conditionals rather than shell
Either make syntax or shell syntax is fine, but the use of $(BUILD_DOCS)
needs to be consistent with that in override_dh_auto_build-indep.  In
particular, make's $(if ...) considers '0' to be true (empty string is
false).

This change switches to make syntax (empty string is false), which is a
bit more surprising but has the advantage that we can drop all the "; \"
nonsense at end of line (and gain `set -e` behaviour).
2015-04-21 20:59:55 +10:00
Angus Lees
1261b4b365 Replace compile-time dylibs with symlinks to run-time
Dylibs (lib*.so) are installed both into $prefix/lib/rustlib/$triple/lib
for use at compile/link time by rustc, and into $prefix/lib for later
use at runtime by ld.so.  The files are not byte-for-byte identical
since they come from different stages of the compiler build, but they
are expected to be functionally equivalent.

This change simply replaces one set with symlinks to the other, reducing
installed size by about 68MB.
2015-04-20 17:21:01 +10:00
Angus Lees
d75d48d616 Set architecture flags in all cases
dpkg-buildpackage sets DEB_{BUILD,HOST,TARGET}_* before invoking
debian/rules.  This change includes /usr/share/dpkg/architecture.mk to
ensure the same variables are set even if debian/rules is invoked in
other ways (eg: directly).
2015-04-20 17:21:00 +10:00
Sylvestre Ledru
3576302d88 Use jquery package 2015-04-12 22:09:12 +02:00
Sylvestre Ledru
4c74b6d2a5 fix warning debian-rules-ignores-make-clean-error 2015-04-12 10:54:30 +02:00
Sylvestre Ledru
74e68f77cf Comment for now before upload 2015-03-23 15:36:26 +01:00
Sylvestre Ledru
120b4d47b6 rename nodocs to nodoc to match what is done in Debian usually 2015-03-14 08:02:15 +01:00
Angus Lees
39a0abff70 Install into debian/tmp regardless of number of packages
With build profiles, it's possible for dh_auto_install to think we only
have a single package and install into debian/$pkg - breaking various
other files that assume debian/tmp.

This change forces dh_auto_install to always set DESTDIR=debian/tmp
regardless of the apparent number of packages.
2015-03-10 13:16:48 +11:00
Angus Lees
7d40d3e194 Set CFLAGS/LDFLAGS/etc according to Debian policy
Debian wants to build all binaries with particular hardening flags.  The
Rust makefiles inconsistently support CFLAGS/etc from the environment
for only some platforms (see mk/cfg/*).

This patch adds upstream support for LDFLAGS, and then unconditionally
prepends CFLAGS/LDFLAGS/etc to the build commands regardless of rust
platform.  debian/rules then sets these flags from dpkg-buildflags.  A
slight wrinkle in the above is also passing LDFLAGS via `rustc -C
link-args` (which in turn assumes rust is using GNU ld for linking).
2015-03-08 23:50:25 +11:00
Luca Bruno
0be7358cfc rules: respect 'nocheck' DEB_BUILD_OPTIONS
Signed-off-by: Luca Bruno <lucab@debian.org>
2015-03-06 23:02:40 +01:00
Angus Lees
0577fc8471 Build against system LLVM
Now that a sufficient version (>= 3.6 RC4) exists in unstable.
2015-02-27 09:50:00 +00:00
Angus Lees
11c430bec9 Improve clean target
Run `make clean-all` which also cleans LLVM source.
2015-02-27 09:50:00 +00:00
Angus Lees
bc0aa84e4b Numerous minor rust-doc fixups
- Correct guard on privacy-breach-logo fix
- Install RELEASES.md as upstream changelog
- Ignore TeX intermediate files when installing docs
- Install README.md into /usr/share/doc/rust/
- Install upstream docs into /usr/share/doc/rust-doc/html/
- Correct Index paths in doc-base files
- Add doc-base file for the Style Guidelines doc
2015-02-27 09:50:00 +00:00
Sylvestre Ledru
1c8ac2b079 * 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
  - Introduction of rust-mode, vim-syntax-rust & kate-syntax-rust packages
  - Better declarations of the doc
  - Update of the description
  - Watch file updated (with key check)
2015-02-15 18:59:02 +01:00
Luca Bruno
d4357a263f debian: set release channel for ./configure 2015-01-25 10:26:08 +01:00
Luca Bruno
3f9812c21a debian: update var names in rules 2015-01-23 17:20:30 +01:00
Sylvestre Ledru
cd3b5a3bd8 disable the parallel build 2015-01-23 17:14:16 +01:00
Luca Bruno
b59979d9b3 debian: simplify version variables in rules 2015-01-23 17:09:42 +01:00
Luca Bruno
1f05e8ae8a debian: fix typo (split line) in rules 2015-01-22 00:06:48 +01:00
Sylvestre Ledru
a51d697676 also delete empty files 2015-01-21 19:20:03 +01:00
Sylvestre Ledru
6fce0a9982 Remove the favicon from the doc 2015-01-21 19:11:04 +01:00
Sylvestre Ledru
2d084d4c18 bing brack parallel build 2015-01-21 14:45:30 +01:00
Sylvestre Ledru
5294c94c0b Use rust.manpages 2015-01-21 14:31:01 +01:00
Sylvestre Ledru
c18f75cf30 Enable the testsuite 2015-01-21 12:01:33 +01:00
Jordan Justen
3b5d38b25d debian: Don't copy files from debian/dl
Instead we will use ../rust_$VERSION.orig-dl.tar.gz and debian's
multiple upstream tarball support.

Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-20 16:58:16 -08:00
Sylvestre Ledru
8354de7ad6 * Update the make install logic to install in debian/tmp/
instead of debian/rust and use the *.install files
* Introduce the rust-doc package
2015-01-20 18:07:05 +01:00
Sylvestre Ledru
becfe001c1 verbose mode 2015-01-20 16:47:36 +01:00
Sylvestre Ledru
7bdffa5bcc add a todo + bikeshedding 2015-01-20 10:08:02 +01:00
Jordan Justen
ac9de7b61c debian: Set enable-rpath flag for internal rust libraries
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:23:44 -08:00
Jordan Justen
a97d69b7db debian: Add rust-gdb links
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:48 -08:00
Jordan Justen
0f729e318d debian: shlibdeps support for multiple architectures
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:48 -08:00
Jordan Justen
1870024997 debian: Handle 1.0.0-alpha version number
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:48 -08:00
Jordan Justen
03b69fec33 debian: Fix issue seen with sudo pbuilder
sudo pbuilder caused SUDO_USER to be set during the
build. mk/install.mk will then try to run sudo, but since sudo is not
a build-dep, this will fail.

Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:47 -08:00
Jordan Justen
f588d68d54 debian: Add rust stage0 binaries to debian/dl for 1.0.0 alpha
rust-stage0-2015-01-07-9e4e524-linux

Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:46 -08:00
Jordan Justen
c92744c014 debian: Install rust libraries under /usr/lib/<arch>/rust
Install rust under:
usr/lib/$(DEB_HOST_MULTIARCH)/rust/$(RUST_VERSION)

override_dh_shlibdeps is based on
https://launchpad.net/~hansjorg/+archive/ubuntu/rust

usr/bin/rustc and usr/bin/rustdoc will be symlinked to the new install
location.

Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:45 -08:00
Jordan Justen
23d2674b3a debian: Create rustc-0.12 and rustdoc-0.12
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:45 -08:00
Jordan Justen
02b7470845 debian/rules: Define some variables
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:45 -08:00
Jordan Justen
ef10207113 debian: Skip test since it is failing on 0.12
Base on:
https://launchpad.net/~hansjorg/+archive/ubuntu/rust

Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:20:40 -08:00
Jordan Justen
7a06551f27 debian: Set SHELL environment variable when running configure
The configure script uses this to find the shell binary. If not set,
it will try to build i386 when on amd64 systems.

Signed-off-by: Jordan Justen <jljusten@gmail.com>
2015-01-19 10:07:45 -08:00
Luca Bruno
2679d355a1 Enable parallel building of LLVM 2013-08-26 15:45:42 +02:00
Luca Bruno
be771b38b5 Initial packaging 2013-08-26 14:39:51 +02:00