Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upRevert "Remove mako.zip" #13171
Merged
Revert "Remove mako.zip" #13171
Conversation
highfive
commented
Sep 4, 2016
|
Heads up! This PR modifies the following files:
|
highfive
commented
Sep 4, 2016
|
|
|
r? @SimonSapin |
|
@bors-servo r+ |
|
|
bors-servo
added a commit
that referenced
this pull request
Sep 4, 2016
Revert "Remove mako.zip" <!-- Please describe your changes on the following line: --> Stylo doesn't use Servo's virtualenv, so we need to integrate it into Gecko's build before doing this. --- <!-- 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 <!-- Either: --> - [x] There are tests for these changes OR <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> This reverts commit 95e3f83. <!-- 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/13171) <!-- Reviewable:end -->
|
|
highfive
commented
Sep 4, 2016
|
|
@bors-servo retry |
|
|
|
|
1 similar comment
|
|
|
|
highfive
commented
Sep 4, 2016
|
|
@bors-servo retry #13165 |
|
|
|
|
highfive
commented
Sep 4, 2016
|
|
@bors-servo retry Well, this is recurring. |
|
|
|
|
bors-servo
added a commit
that referenced
this pull request
Apr 18, 2017
…, r=Wafflespeanut Stop mach bootstrap from segfaulting <!-- Please describe your changes on the following line: --> See the commit message for details; the top-level import of Mako causes `./mach bootstrap` to segfault in glibc while exiting, seems to have to do with the native `_speedups.so` library of MarkupSafe, a Mako dependency. Needed for servo/saltfs#631. cc @emilio to make sure this is OK for stylo (e.g. #13171) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #12103 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because the test is part of servo/saltfs#631 <!-- 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/16505) <!-- Reviewable:end -->
bors-servo
added a commit
that referenced
this pull request
Apr 18, 2017
…, r=Wafflespeanut Stop mach bootstrap from segfaulting <!-- Please describe your changes on the following line: --> See the commit message for details; the top-level import of Mako causes `./mach bootstrap` to segfault in glibc while exiting, seems to have to do with the native `_speedups.so` library of MarkupSafe, a Mako dependency. Needed for servo/saltfs#631. cc @emilio to make sure this is OK for stylo (e.g. #13171) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #12103 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because the test is part of servo/saltfs#631 <!-- 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/16505) <!-- Reviewable:end -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
emilio commentedSep 4, 2016
•
edited by larsbergstrom
Stylo doesn't use Servo's virtualenv, so we need to integrate it into Gecko's build before doing this.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis reverts commit 95e3f83.
This change is