bitrig integration #21959

dhuseby · 2015-02-05T07:43:06Z

This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org

rust-highfive · 2015-02-05T07:43:12Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pcwalton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

dhuseby · 2015-02-05T07:53:54Z

Fixed the whitespace errors.

alexcrichton · 2015-02-05T17:19:29Z

mk/platform.mk

+  RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CC_$(1))) \
+      -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
+
+  RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))


Can this keep the previous indentation?

alexcrichton · 2015-02-05T17:25:21Z

r? @brson

dhuseby · 2015-02-05T17:26:29Z

Let me fix the other issues and push again.

dhuseby · 2015-02-05T19:38:04Z

I rebased to master too.

dhuseby · 2015-02-05T23:25:48Z

I did. In ad45164.

brson · 2015-02-05T23:33:57Z

@bors: r+ fc147f1

semarie · 2015-02-06T05:55:34Z

src/liblibc/lib.rs

-                    pub st_ctime_nsec: c_long,
+                    pub st_atim: timespec,
+                    pub st_mtim: timespec,
+                    pub st_ctim: timespec,
                    pub st_size: off_t,


I am not completely agreed with the conversion form time_t + c_long to timespec.
Under bitrig and openbsd, the timespec definition is under conditionnal definition:
#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE. Here, the mod is posix01.

Note: the C size of timespec is the same as time_t + c_long, so it don't break code, only the ABI.

see https://github.com/bitrig/bitrig/blob/master/sys/sys/stat.h#L53

good point. 2001 < 2008

dhuseby · 2015-02-07T01:59:18Z

@Manishearth good catch! oops!

dhuseby · 2015-02-07T02:03:22Z

Alright, all review changes are made and I rebased to master.

Manishearth · 2015-02-07T02:05:16Z

The rollup should land in a few minutes; it has conflicts with your PR : try rebasing over https://github.com/Manishearth/rust/compare/rollup (d3732a1)

dhuseby · 2015-02-07T02:17:48Z

@Manishearth I just rebased to d3732a1.

Manishearth · 2015-02-07T02:19:02Z

Great, looks mergeable now.

semarie · 2015-02-07T05:29:30Z

src/liblibc/lib.rs

@@ -4130,7 +4149,7 @@ pub mod consts {
            pub const _SC_THREAD_THREADS_MAX : c_int = 90;
            pub const _SC_THREADS : c_int = 91;
            pub const _SC_TTY_NAME_MAX : c_int = 107;
-            pub const _SC_ATEXIT_MAX : c_int = 46;
+            pub const _SC_ATEXIT_MAX : c_int = 146;
            pub const _SC_XOPEN_CRYPT : c_int = 117;


the _SC_ATEXIT_MAX value is wrong for openbsd and for bitrig too.
please keep 46.
see https://github.com/bitrig/bitrig/blob/master/include/unistd.h#L199

Good catch again! Thank you for taking the time to look at my patch so closely. I must have added the '1' accidentally when I was going through the constants.

alexcrichton · 2015-02-16T23:19:25Z

@bors: retry

bors · 2015-02-17T10:21:02Z

⌛ Testing commit 5513040 with merge 14ac4d0...

bors · 2015-02-17T11:49:21Z

💔 Test failed - auto-win-32-nopt-t

alexcrichton · 2015-02-17T16:16:25Z

@bors: retry

bors · 2015-02-17T21:52:59Z

⌛ Testing commit 5513040 with merge 603553a...

This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org

bors · 2015-02-17T23:45:59Z

💔 Test failed - auto-mac-32-opt

dhuseby · 2015-02-18T18:25:54Z

@alexcrichton @brson again, the auto-mac-32-opt failures are unrelated to my work. the first error is a panic in ReaderRng.fill_bytes:

thread '<unnamed>' panicked at 'ReaderRng.fill_bytes error: IoError { kind: EndOfFile, desc: "end of file", detail: None }', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-32-opt/build/src/libstd/rand/reader.rs:70

and then there are some test failures:

<test>:1:62: 1:63 error: macro undefined: 'z!'
<test>:1 fn bogus() {macro_rules! z (() => (3+4));}fn inty() -> i32 { z!() }
                                                                      ^
error: aborting due to previous error
<test>:1:59: 1:60 error: macro undefined: 'z!'
<test>:1 mod foo {macro_rules! z (() => (3+4));}fn inty() -> i32 { z!() }
                                                                   ^
error: aborting due to previous error

I'm not sure what to do about these? They are unrelated to my changes. Should these prevent my changes from landing?

dhuseby · 2015-02-19T01:18:49Z

@alexcrichton @brson should I rebase to get updated code that might fix the unrelated test failures?

alexcrichton · 2015-02-19T04:21:51Z

@bors: retry

Oh this just looks like a spurious timeout failure

bors · 2015-02-20T02:06:04Z

⌛ Testing commit 5513040 with merge 2f3f7d5...

bors · 2015-02-20T04:13:42Z

💔 Test failed - auto-mac-64-opt

dhuseby · 2015-02-20T05:13:51Z

@alexcrichton @brson again, I'm not sure why this test is failing:

thread '<unnamed>' panicked at 'ReaderRng.fill_bytes error: IoError { kind: EndOfFile, desc: "end of file", detail: None }', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt/build/src/libstd/rand/reader.rs:70

I'm certain that this is unrelated to my patch.

dhuseby · 2015-02-20T05:14:13Z

would rebasing help here?

semarie · 2015-02-20T12:48:56Z

@dhuseby the error you cite isn't the cause of the build failed. I think the error line come from rand::reader::test::test_reader_rng_insufficient_bytes test (which is ok).

The problem is a timeout in testing std crate (20 min without output).

I am not sure a rebasing would help. it seems some buildbots have some instabilities (timeout, file creation problem...).

alexcrichton · 2015-02-20T16:45:11Z

@bors: retry

@semarie's analysis is spot on (this just needs a retry)

dhuseby · 2015-02-20T17:05:24Z

@alexcrichton how many more times do we have to repeat this before we declare the testing system broken and land the patch anyway?

alexcrichton · 2015-02-20T19:42:43Z

Sorry our buildbots aren't always the most reliable builders :(

brson · 2015-02-20T21:40:31Z

@bors: retry

Apparently there have been a lot of timeouts lately, but unfortunately we can't land anything without a successful test run.

brson · 2015-02-20T21:43:30Z

I don't see other mac timeouts from looking through the build history.

@alexcrichton says we're having a lot of problems with windows right now.

bors · 2015-02-21T03:46:16Z

⌛ Testing commit 5513040 with merge 9efabd8...

bors · 2015-02-21T05:28:26Z

💔 Test failed - auto-win-64-opt

alexcrichton · 2015-02-21T06:22:50Z

@bors: retry

bors · 2015-02-21T09:20:49Z

⌛ Testing commit 5513040 with merge 2b01a37...

This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org

bors · 2015-02-21T12:23:42Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

rust-highfive assigned pcwalton Feb 5, 2015

alexcrichton reviewed Feb 5, 2015
View reviewed changes

rust-highfive assigned brson and unassigned pcwalton Feb 5, 2015

semarie reviewed Feb 6, 2015
View reviewed changes

semarie reviewed Feb 7, 2015
View reviewed changes

bors added a commit that referenced this pull request Feb 17, 2015

Auto merge of #21959 - dhuseby:bitrig-support, r=brson

603553a

This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org

bors added a commit that referenced this pull request Feb 21, 2015

Auto merge of #21959 - dhuseby:bitrig-support, r=brson

2b01a37

This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org

bors merged commit 5513040 into rust-lang:master Feb 21, 2015

bitrig integration #21959

bitrig integration #21959

Conversation

dhuseby commented Feb 5, 2015

rust-highfive commented Feb 5, 2015

dhuseby commented Feb 5, 2015

alexcrichton Feb 5, 2015

Choose a reason for hiding this comment

alexcrichton commented Feb 5, 2015

dhuseby commented Feb 5, 2015

dhuseby commented Feb 5, 2015

dhuseby commented Feb 5, 2015

brson commented Feb 5, 2015

semarie Feb 6, 2015

Choose a reason for hiding this comment

dhuseby Feb 7, 2015

Choose a reason for hiding this comment

dhuseby commented Feb 7, 2015

dhuseby commented Feb 7, 2015

Manishearth commented Feb 7, 2015

dhuseby commented Feb 7, 2015

Manishearth commented Feb 7, 2015

semarie Feb 7, 2015

Choose a reason for hiding this comment

dhuseby Feb 7, 2015

Choose a reason for hiding this comment

alexcrichton commented Feb 16, 2015

bors commented Feb 17, 2015

bors commented Feb 17, 2015

alexcrichton commented Feb 17, 2015

bors commented Feb 17, 2015

bors commented Feb 17, 2015

dhuseby commented Feb 18, 2015

dhuseby commented Feb 19, 2015

alexcrichton commented Feb 19, 2015

bors commented Feb 20, 2015

bors commented Feb 20, 2015

dhuseby commented Feb 20, 2015

dhuseby commented Feb 20, 2015

semarie commented Feb 20, 2015

alexcrichton commented Feb 20, 2015

dhuseby commented Feb 20, 2015

alexcrichton commented Feb 20, 2015

brson commented Feb 20, 2015

brson commented Feb 20, 2015

bors commented Feb 21, 2015

bors commented Feb 21, 2015

alexcrichton commented Feb 21, 2015

bors commented Feb 21, 2015

bors commented Feb 21, 2015