Граф коммитов

4 Коммитов

Автор SHA1 Сообщение Дата
Ms2ger 07a6ecf941 servo: Merge #5453 - Remove an unused import (from Ms2ger:unused-import); r=glennw
I accidentally left it in after removing the calls to stdout/stderr in
d926b8342b492cfa442a72b4d4da01e7e23d9cba.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5ead929fea34ca6d05d6bc4f0a07eeab4dfae207
2015-03-30 09:46:07 -06:00
Ms2ger 61c91ab321 servo: Merge #5444 - Fix gonk warnings (from servo:gonk-warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: acf98dcccdd0affce6346ebf1f6187b2e07761dc
2015-03-29 17:54:59 -06:00
Simon Sapin da87abc762 servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
Ready for review.

Final link step on android fails, but we know how to fix it and will add it to this branch soon.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9

--HG--
rename : servo/ports/gonk/build.rs => servo/support/rust-task_info/build.rs
2015-02-11 17:24:45 -07:00
Manish Goregaokar 49c6598243 servo: Merge #4864 - Gonk upgrade (from Manishearth:gonkup1); r=larsbergstrom
This does a rustup to our current rustc.

Gonk now compiles, but doesn't run. Trying to fix this, but thought I'd PR my progress.

This needs a couple of things to work:

 - An override of time  (7f105d4dd2), with `timegm(struct tm *tm)`  from `src/time_helpers.c` commented out
 - An override of openssl (1a60bccb6a), with [this patch](http://hastebin.com/onovacofuj.diff)
 - An override of gl-rs (230e6c9ed6), with submodules updated. This is because the lockfile is messed up due to conflicting github and registry deps. While I could fix this by forking things, this goes away next rustup anyway (the deps all move to a common source), so I just worked around it with a clone.
 - Env vars similar to [this](http://hastebin.com/hawadubolu.bash)
 - After the last failed link step, run `../../mach rustc` with the same args (extracted from `../../mach cargo -v`), along with `-C link-args="$LDFLAGS -lGLESv2 -L $GONKDIR/backup-flame/system/lib/"`
 - (Steps for creating a B2G build [here](https://www.irccloud.com/pastebin/VG2lHBVP))

r? @larsbergstrom

(No need for a merge, just a check on the unsafe stuff would be fine)

Source-Repo: https://github.com/servo/servo
Source-Revision: 11edfdc9353362161b0ff9a654d61dccd1d438f0
2015-02-07 09:09:43 -07:00