Hi,
landry@ pointed to me that firefox 53.0 doesn't build with cargo 0.18.0.
See https://bugzilla.mozilla.org/show_bug.cgi?id=1360521 .
Cargo 0.18.0 has behavior change (if rustc is stabilized, it isn't the
case for cargo): it assumes build.rs is a build script:
https://github.com/rust-lang/cargo/pull/3664
But Firefox has such code in his tree (mp4parse_capi).
Here a diff to firefox to fix the build with cargo-0.18.0. Please note
the diff is also compatible with cargo 0.16.0 (current version in tree).
Thanks.
--
Sebastien Marie
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.315
diff -u -p -r1.315 Makefile
--- Makefile 20 Apr 2017 06:12:58 -0000 1.315
+++ Makefile 29 Apr 2017 17:28:08 -0000
@@ -10,6 +10,7 @@ MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
BROKEN-sparc64 = xpcshell SIGBUS during fake
EXTRACT_SUFX = .tar.xz
+REVISION = 0
SO_VERSION = 71.0
# NOTE: Must bump minor version if any shlib's are removed from the
Index: patches/patch-media_libstagefright_binding_mp4parse_capi_Cargo_toml
===================================================================
RCS file: patches/patch-media_libstagefright_binding_mp4parse_capi_Cargo_toml
diff -N patches/patch-media_libstagefright_binding_mp4parse_capi_Cargo_toml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-media_libstagefright_binding_mp4parse_capi_Cargo_toml 29 Apr 2017 17:28:08 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1360521
+--- media/libstagefright/binding/mp4parse_capi/Cargo.toml.orig Fri Apr 28 15:17:41 2017
++++ media/libstagefright/binding/mp4parse_capi/Cargo.toml Fri Apr 28 15:17:46 2017
+@@ -18,6 +18,8 @@ exclude = [
+ "*.mp4",
+ ]
+
++build = false
++
+ [dependencies]
+ byteorder = "1.0.0"
+ "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
No comments:
Post a Comment