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 for js, fontconfig-sys and mozjs_sys #6218

Merged
merged 2 commits into from May 31, 2015
Merged

Update dependencies for js, fontconfig-sys and mozjs_sys #6218

merged 2 commits into from May 31, 2015

Conversation

@asbaker
Copy link
Contributor

asbaker commented May 29, 2015

Fixes #6088

Review on Reviewable
@asbaker
Update dependencies for js, fontconfig-sys and mozjs_sys
Loading status checks…
2ab1051
@highfive
Copy link

highfive commented May 29, 2015

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @kmcallister (or someone else) soon.
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented May 29, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5132

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
@asbaker
Copy link
Contributor Author

asbaker commented May 29, 2015

@SimonSapin Thanks for getting those other fixes reviewed and merged so quickly! This should be the last part for #6088.

I updated the js, fontconfig-sys and mozjs_sys packages using mach update-cargo -p <package> to pull in the makefile fixes from those dependencies.

Running another egrep from cargo shows that there are no remaining makefile hacks that traverse up the tree:

~/Source/servo <update-dependencies-for-6088> grep -ri "shell find" .
./.cargo/git/checkouts/mozjs-2284529523a8d467/master/js/src/Makefile.in:ALL_FILES=$(shell find $(srcdir) \( -name "*.cpp" -o -name "*.h" \) ! -path "*/dist/*" ! -path "*/config/*")
./.cargo/git/checkouts/rust-azure-03a3575c638f374d/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
./.cargo/git/checkouts/rust-core-foundation-083fc637ecf87027/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-core-graphics-1e327b35416cbd60/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-core-text-e599875907e5f455/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-egl-995f9207ca3ade64/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-fontconfig-aa919ab93567a942/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-freetype-c7f42bafd2dee115/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-io-surface-f335bb7b39c2aba0/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-layers-3d9d5f0b4e4d9002/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-mozjs-ab9bfe6e592bc16c/master/Makefile.in:RUST_SRC = $(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/git/checkouts/rust-stb-image-f9fd72864e9c69fe/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
./.cargo/git/checkouts/rust-xlib-13f0f7593ba233ec/master/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/registry/src/github.com-1ecc6299db9ec823/glutin_core_foundation-0.1.2/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./.cargo/registry/src/github.com-1ecc6299db9ec823/glutin_core_graphics-0.1.4/Makefile.in:RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
./components/servo/target/debug/build/mozjs_sys-476fe81cd282b5dc/out/Makefile:ALL_FILES=$(shell find $(srcdir) \( -name "*.cpp" -o -name "*.h" \) ! -path "*/dist/*" ! -path "*/config/*")
./support/rust-task_info/Makefile.in:RUST_SRC = $(shell find $(VPATH)/. -type f -name '*.rs')
@SimonSapin
Copy link
Member

SimonSapin commented May 30, 2015

Looks good, thanks for pushing on this!

I’ve edited your PR message to "Fixes #6088" so that GitHub closes it automatically when this lands, since this is the last part.
@SimonSapin
Copy link
Member

SimonSapin commented May 30, 2015

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

bors-servo commented May 30, 2015

📌 Commit 2ab1051 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented May 30, 2015

⌛ Testing commit 2ab1051 with merge f4584c9...
bors-servo pushed a commit that referenced this pull request May 30, 2015
bors-servo
Auto merge of #6218 - asbaker:update-dependencies-for-6088, r=SimonSapin
f4584c9 
Fixes #6088

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

bors-servo commented May 30, 2015

💔 Test failed - gonk
@SimonSapin
Copy link
Member

SimonSapin commented May 30, 2015 

In file included from /home/servo/.cargo/git/checkouts/libfontconfig-b319b63600e740b1/master/src/fcftint.h:26:0,
                 from /home/servo/.cargo/git/checkouts/libfontconfig-b319b63600e740b1/master/src/fcfreetype.c:48:
/home/servo/.cargo/git/checkouts/libfontconfig-b319b63600e740b1/master/fontconfig/fcfreetype.h:27:22: fatal error: ft2build.h: No such file or directory

Looks like a legit error, something is missing in one of the build scripts or makefiles.
@SimonSapin
Copy link
Member

SimonSapin commented May 30, 2015

Can you build locally, with this PR?
@SimonSapin SimonSapin mentioned this pull request May 30, 2015
Merged
@SimonSapin
Copy link
Member

SimonSapin commented May 30, 2015

servo/libfontconfig#5 (comment)
@asbaker
Update libfontconfig
Loading status checks…
262e0ef
@SimonSapin
Copy link
Member

SimonSapin commented May 31, 2015

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

bors-servo commented May 31, 2015

📌 Commit 262e0ef has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented May 31, 2015

⌛ Testing commit 262e0ef with merge 5916143...
bors-servo pushed a commit that referenced this pull request May 31, 2015
bors-servo
Auto merge of #6218 - asbaker:update-dependencies-for-6088, r=SimonSapin
Loading status checks…
5916143 
Fixes #6088

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

bors-servo commented May 31, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2
@bors-servo bors-servo merged commit 262e0ef into servo:master May 31, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
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
No one assigned
Labels
S-awaiting-review
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Replace /usr/bin/find hacks in dependency makefiles with Cargo variables
6 participants
@asbaker @highfive @hoppipolla-critic-bot @SimonSapin @bors-servo @nox
You can’t perform that action at this time.