Skip to content
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

armv7 support #53

Merged
merged 1 commit into from Apr 27, 2016
Merged

armv7 support #53

merged 1 commit into from Apr 27, 2016

Conversation

@fabricedesre
Copy link
Contributor

fabricedesre commented Apr 26, 2016

No description provided.

@fabricedesre
Copy link
Contributor Author

fabricedesre commented Apr 26, 2016

Cargo.toml Outdated
@@ -40,6 +40,10 @@ features = ["xlib"]
version = "2.3.0"
features = ["xlib"]

[target.armv7-unknown-linux-gnueabihf.dependencies.x11]

This comment has been minimized.

@jdm

jdm Apr 26, 2016

Member

It's legal to do

[target.cfg(target_os = "linux").dependencies]
x11 = { version = "2.3.0", features = ["xlib"] }

and that would allow us to remove all of these duplicate entries, I'm pretty sure.

This comment has been minimized.

@fabricedesre

fabricedesre Apr 26, 2016

Author Contributor

Cool, i'll try that. And maybe I'll update all the other repos where I added the armv7 section...

@emilio
Copy link
Member

emilio commented Apr 26, 2016

Looks good, also needs a version bump :P

I'd prefer to use the cfg() syntax, but if it's blocking or something I can merge it right away and do the changes myself.

@fabricedesre fabricedesre force-pushed the fabricedesre:armv7 branch from 76fc3a3 to 417d7a6 Apr 27, 2016
@fabricedesre
Copy link
Contributor Author

fabricedesre commented Apr 27, 2016

r? @emilio

@SimonSapin
Copy link
Member

SimonSapin commented Apr 27, 2016

lib.rs uses cfg(target_os="linux") and cfg(target_os="macos"). ("unix" applies to both.)

@emilio
Copy link
Member

emilio commented Apr 27, 2016

Y es, xlib should not be used on Marcos Mac OS.

@fabricedesre fabricedesre force-pushed the fabricedesre:armv7 branch from 417d7a6 to 81a3811 Apr 27, 2016
@fabricedesre
Copy link
Contributor Author

fabricedesre commented Apr 27, 2016

Updated, sorry.

@emilio
Copy link
Member

emilio commented Apr 27, 2016

LGTM, will merge and publish after the travis run :)

Actually don't be sorry, thanks for doing this :)

@emilio emilio merged commit 657c7f8 into servo:master Apr 27, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.