Contents of /trunk/mozilla-firefox/patches/firefox-53.0.3-dont-try-to-build-mp4parse-bindings.patch
Parent Directory | Revision Log
Revision 2926 -
(show annotations)
(download)
Mon May 22 14:58:44 2017 UTC (7 years, 4 months ago) by niro
File size: 1662 byte(s)
Mon May 22 14:58:44 2017 UTC (7 years, 4 months ago) by niro
File size: 1662 byte(s)
-added built fixes
1 | From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001 |
2 | From: Ralph Giles <giles@mozilla.com> |
3 | Date: Fri, 10 Feb 2017 12:58:18 -0800 |
4 | Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj |
5 | |
6 | We use the cheddar crate to generate a C header file |
7 | for our mp4parse_capi wrapper crate. Currently we |
8 | do this at code check-in time via update-rust.sh. |
9 | |
10 | Cargo 0.18 and later will try to execute a build.rs |
11 | file in the crate source tree regardless of whether |
12 | it's specified in Cargo.toml so patching out that |
13 | line just results in 'crate cheddar not found'. |
14 | |
15 | This change restores the old behaviour by substituting |
16 | a 'build = false' line instead. |
17 | |
18 | We do have syntex vendored, but we don't currently build |
19 | it by default, so I prefer this solution to just vendoring |
20 | cheddar and generating the header at build time. The syntex |
21 | crate is quite large and adds significantly to our compile |
22 | time. |
23 | |
24 | MozReview-Commit-ID: InJRRODWAdP |
25 | |
26 | --HG-- |
27 | extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e |
28 | --- |
29 | media/libstagefright/binding/mp4parse-cargo.patch | 5 +++-- |
30 | media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++ |
31 | 2 files changed, 5 insertions(+), 2 deletions(-) |
32 | |
33 | diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml |
34 | index aee7ee947151a27c..d7e3f55119d3f4b6 100644 |
35 | --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml |
36 | +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml |
37 | @@ -18,6 +18,8 @@ exclude = [ |
38 | "*.mp4", |
39 | ] |
40 | |
41 | +build = false |
42 | + |
43 | [dependencies] |
44 | byteorder = "1.0.0" |
45 | "mp4parse" = {version = "0.6.0", path = "../mp4parse"} |
46 | -- |
47 | 2.12.2 |
48 |