diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-25 18:25:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-25 18:25:19 -0400 |
commit | 880f3b8b7a34b48449c372238b32333fe1f1cc4f (patch) | |
tree | db5cbe8d159421dbf841ea9b4de060a273537132 | |
parent | 36bb42525a4bda8b9ed72a996e0fcf00af4da1c3 (diff) | |
parent | 73a874f742a5243a70bd61fefe7a19b154a264e3 (diff) | |
download | servo-880f3b8b7a34b48449c372238b32333fe1f1cc4f.tar.gz servo-880f3b8b7a34b48449c372238b32333fe1f1cc4f.zip |
Auto merge of #23268 - asajeffrey:magicleap-package-fixes, r=jdm
Magicleap package fixes
<!-- Please describe your changes on the following line: -->
A couple of fixes for magicleap packaging...
* Move the setting of the debuggable flag into the `.package` file where it belongs,
* Allow compiling with v0.20.0 of the SDK.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because it fixes the build
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23268)
<!-- Reviewable:end -->
-rw-r--r-- | python/servo/package_commands.py | 3 | ||||
-rw-r--r-- | support/magicleap/Servo2D/Servo2D.mabu | 4 | ||||
-rw-r--r-- | support/magicleap/Servo2D/Servo2D.package | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index ac27eeda68b..94a30dfe421 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -238,9 +238,6 @@ class PackageCommands(CommandBase): mabu, "-o", target_dir, "-t", build_type, - # Servo SEGVs if we don't set the debuggable flag in the mpk's taildata - # https://github.com/servo/servo/issues/22188 - "--add-tail-data-args=--debuggable", package ] try: diff --git a/support/magicleap/Servo2D/Servo2D.mabu b/support/magicleap/Servo2D/Servo2D.mabu index edb0ab3d9c9..60404f038ea 100644 --- a/support/magicleap/Servo2D/Servo2D.mabu +++ b/support/magicleap/Servo2D/Servo2D.mabu @@ -21,6 +21,10 @@ SHLIBS = \ log \ z +# https://github.com/servo/servo/issues/23267 +CXXFLAGS = \ + -Wno-deprecated + USES = \ lumin_runtime \ code/srcsGen diff --git a/support/magicleap/Servo2D/Servo2D.package b/support/magicleap/Servo2D/Servo2D.package index c8020d772ca..7d6f264e57f 100644 --- a/support/magicleap/Servo2D/Servo2D.package +++ b/support/magicleap/Servo2D/Servo2D.package @@ -4,4 +4,8 @@ USES = "scenes" "pipeline/cache/AssetManifest" DATAS = \ fonts.xml : etc/fonts.xml -REFS = Servo2D
\ No newline at end of file +REFS = Servo2D + +# Servo SEGVs if we don't set the debuggable flag in the mpk's taildata +# https://github.com/servo/servo/issues/22188 +OPTIONS=package/debuggable/on |