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

unbreak openbsd after nacl intergration #22792

Merged
merged 1 commit into from
Feb 25, 2015

Conversation

semarie
Copy link
Contributor

@semarie semarie commented Feb 25, 2015

The recent commit on liblibc for nacl break the compilation for OpenBSD (and Bitrig too, I think).

The problem is ino_t come from another block too now. This patch remove the extra declaration.

.../src/liblibc/lib.rs:98:9: 98:37 error: a type named `ino_t` has already been imported in this module [E0251]
.../src/liblibc/lib.rs:98 pub use types::os::arch::posix01::*;
                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error

@dhuseby do you have this problem too ? and if yes, does this patch correct it ?

@rust-highfive
Copy link
Collaborator

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member

@bors: r+ 91e00f3 rollup

@dhuseby
Copy link

dhuseby commented Feb 25, 2015

@semarie I'm in the process of catching up to HEAD building snapshots. I'll know in a day if this is a problem. A cursory glance suggests that it is a problem.

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 25, 2015
…xcrichton

 The recent commit on liblibc for nacl break the compilation for OpenBSD (and Bitrig too, I think).

The problem is `ino_t` come from another block too now. This patch remove the extra declaration.

```
.../src/liblibc/lib.rs:98:9: 98:37 error: a type named `ino_t` has already been imported in this module [E0251]
.../src/liblibc/lib.rs:98 pub use types::os::arch::posix01::*;
                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error
```

@dhuseby do you have this problem too ? and if yes, does this patch correct it ?
@dhuseby
Copy link

dhuseby commented Feb 25, 2015

@semarie yup, I just ran into the break building the latest HEAD using the my most recent bitrig snapshot. I have a couple other fixes to submit as well.

@bors bors merged commit 91e00f3 into rust-lang:master Feb 25, 2015
@semarie semarie deleted the openbsd-unbreak-nacl branch February 26, 2015 05:04
semarie added a commit to semarie/rust that referenced this pull request Mar 1, 2015
this is the same problem as openbsd (rust-lang#22792).

without the patch, liblibc don't build.
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 1, 2015
…hton

 this is the same problem as openbsd (rust-lang#22792).
without the patch, liblibc don't build.

@mneumann please comment.
I have encountered this problem while building some rust libs with `target=x86_64-unknown-dragonfly` (while working on rust-lang#22794)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants