Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies with fixes for native ARM builds #7961

Merged
merged 1 commit into from Oct 12, 2015
Merged

Update dependencies with fixes for native ARM builds #7961

merged 1 commit into from Oct 12, 2015

Conversation

@connorimes
Copy link
Contributor

connorimes commented Oct 10, 2015

Review on Reviewable
@connorimes
Copy link
Contributor Author

connorimes commented Oct 10, 2015

These updated dependencies allow building servo natively on an ARM system. More changes likely to come later as I test on other devices. Cef and gonk ports don't build yet.
@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 10, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2015

📌 Commit 3ce78f6 has been approved by mbrubeck
@mbrubeck mbrubeck self-assigned this Oct 10, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2015

⌛ Testing commit 3ce78f6 with merge 5bd567e...
bors-servo pushed a commit that referenced this pull request Oct 10, 2015
bors-servo
Auto merge of #7961 - connorimes:arm-crate-updates, r=mbrubeck
5bd567e 
Update dependencies with fixes for native ARM builds



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7961)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2015

💔 Test failed - linux-rel
@jdm
Copy link
Member

jdm commented Oct 10, 2015 

In file included from libazure/DataSurfaceHelpers.h:9:0,
                 from libazure/FilterNodeSoftware.cpp:9:
libazure/2D.h:32:22: fatal error: ft2build.h: No such file or directory
 #include "ft2build.h"
                      ^
compilation terminated.
@connorimes
Copy link
Contributor Author

connorimes commented Oct 10, 2015

I don't see why that should be the case, nothing changed in the code. The only change in rust-azure is in selecting the correct gcc/ar to use.
@connorimes connorimes force-pushed the connorimes:arm-crate-updates branch from 3ce78f6 to 23b3d88 Oct 10, 2015
@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 10, 2015

This pulls in servo/libfreetype2#17 which is a significant change to the freetype-sys build. In particular, if the freetype-sys build script uses pkg-config successfully, then it no longer outputs the DEP_FREETYPE_OUTDIR variable which is used by azure here.
@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 11, 2015

servo/rust-azure#203 fixes the azure build error.
@connorimes
Update dependencies with fixes for native ARM builds
Loading status checks…
d14888f
@connorimes
Copy link
Contributor Author

connorimes commented Oct 12, 2015

At @jdm 's request I pulled the rust-azure update from this PR, but the problem it caused should be fixed in @mbrubeck 's PR above which is now merged. We can either retry the build in this PR as is and do the rust-azure dependency update separately, or I can add it back in before we continue. Let me know how you want to proceed.
@jdm
Copy link
Member

jdm commented Oct 12, 2015

You can add it back in, now that we have a theory for why the previous build failed.
@connorimes connorimes force-pushed the connorimes:arm-crate-updates branch from 23b3d88 to d14888f Oct 12, 2015
@connorimes
Copy link
Contributor Author

connorimes commented Oct 12, 2015

OK, it's added back in. I think we're ready to try again. Thanks.
@jdm
Copy link
Member

jdm commented Oct 12, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2015

📌 Commit d14888f has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2015

⌛ Testing commit d14888f with merge 71c5587...
bors-servo pushed a commit that referenced this pull request Oct 12, 2015
bors-servo
Auto merge of #7961 - connorimes:arm-crate-updates, r=jdm
Loading status checks…
71c5587 
Update dependencies with fixes for native ARM builds



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7961)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit d14888f into servo:master Oct 12, 2015
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mbrubeck mbrubeck

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@connorimes @mbrubeck @bors-servo @jdm @highfive
You can’t perform that action at this time.