Auto merge of #7342 - connorimes:fix-heartbeats-build, r=larsbergstrom

Fix heartbeats build with new -sys version. Fixes #7328

Updated -sys packages to build from a local copy of the native library source rather than using git submodules.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7342)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-24 15:05:56 -06:00
commit abb57c3579
3 changed files with 6 additions and 6 deletions

View file

@ -681,7 +681,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d6069d9e747a54d9d8"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -698,7 +698,7 @@ dependencies = [
[[package]]
name = "hbs-pow-sys"
version = "0.1.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d6069d9e747a54d9d8"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
dependencies = [
"hbs-common-sys 0.1.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

4
ports/cef/Cargo.lock generated
View file

@ -673,7 +673,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d6069d9e747a54d9d8"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -690,7 +690,7 @@ dependencies = [
[[package]]
name = "hbs-pow-sys"
version = "0.1.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d6069d9e747a54d9d8"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
dependencies = [
"hbs-common-sys 0.1.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

4
ports/gonk/Cargo.lock generated
View file

@ -557,7 +557,7 @@ dependencies = [
[[package]]
name = "hbs-common-sys"
version = "0.1.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d6069d9e747a54d9d8"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -574,7 +574,7 @@ dependencies = [
[[package]]
name = "hbs-pow-sys"
version = "0.1.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#4476aa6ad4e2dfded87251d6069d9e747a54d9d8"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#2b415b92cd955e63c4b939b91a3e7dbf5902c8af"
dependencies = [
"hbs-common-sys 0.1.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",