Skip to content

Commit

Permalink
Bug 1376411 - Update libc to 0.2.24 to get support for more Tier3 pla…
Browse files Browse the repository at this point in the history
…tforms. r=rillian

MozReview-Commit-ID: Ct1en8VPEWf
  • Loading branch information
jbeich committed Jun 29, 2017
1 parent 5e6bfe8 commit 47d040e
Show file tree
Hide file tree
Showing 68 changed files with 6,123 additions and 650 deletions.
10 changes: 5 additions & 5 deletions js/src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions testing/geckodriver/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion third_party/rust/libc/.cargo-checksum.json

Large diffs are not rendered by default.

32 changes: 21 additions & 11 deletions third_party/rust/libc/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ dist: trusty
services:
- docker
install:
- curl https://static.rust-lang.org/rustup.sh |
sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
- if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
script:
- cargo build
- cargo build --no-default-features
Expand All @@ -17,41 +16,50 @@ script:
sh ci/run.sh $TARGET;
fi
- rustc ci/style.rs && ./style src
osx_image: xcode7.3
env:
global:
secure: "e2/3QjgRN9atOuSHp22TrYG7QVKcYUWY48Hi9b60w+r1+BhPkTseIJLte7WefRhdXtqpjjUJTooKDhnurFOeHaCT+nmBgiv+FPU893sBl4bhesY4m0vgUJVbNZcs6lTImYekWVb+aqjGdgV/XAgCw7c3kPmrZV0MzGDWL64Xaps="
matrix:
include:
# 1.0.0 compat
- os: linux
env: TARGET=x86_64-unknown-linux-gnu
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: 1.0.0
script: cargo build
install:

# build documentation
- os: linux
env: TARGET=x86_64-unknown-linux-gnu
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: nightly
script: sh ci/dox.sh

# stable compat
- os: linux
env: TARGET=x86_64-unknown-linux-gnu
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: stable
- os: linux
env: TARGET=i686-unknown-linux-gnu
rust: stable
- os: osx
env: TARGET=x86_64-apple-darwin
env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: stable
- os: osx
env: TARGET=i686-apple-darwin
rust: stable
- os: linux
env: TARGET=arm-linux-androideabi
rust: stable
- os: linux
env: TARGET=aarch64-linux-android
rust: stable
- os: linux
env: TARGET=i686-linux-android
rust: stable
# as of 2017/05/03 x86_64-linux-android are not on stable
- os: linux
env: TARGET=x86_64-linux-android
rust: beta
- os: linux
env: TARGET=x86_64-unknown-linux-musl
rust: stable
Expand All @@ -65,9 +73,11 @@ matrix:
env: TARGET=aarch64-unknown-linux-gnu
rust: stable
- os: osx
osx_image: xcode8.2
env: TARGET=i386-apple-ios
rust: stable
- os: osx
osx_image: xcode8.2
env: TARGET=x86_64-apple-ios
rust: stable
- os: linux
Expand All @@ -94,18 +104,18 @@ matrix:

# beta
- os: linux
env: TARGET=x86_64-unknown-linux-gnu
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: beta
- os: osx
env: TARGET=x86_64-apple-darwin
env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: beta

# nightly
- os: linux
env: TARGET=x86_64-unknown-linux-gnu
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: nightly
- os: osx
env: TARGET=x86_64-apple-darwin
env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: nightly

# QEMU based targets that compile in an emulator
Expand Down
2 changes: 1 addition & 1 deletion third_party/rust/libc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "libc"
version = "0.2.20"
version = "0.2.24"
authors = ["The Rust Project Developers"]
license = "MIT/Apache-2.0"
readme = "README.md"
Expand Down
21 changes: 20 additions & 1 deletion third_party/rust/libc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,25 @@ We have two automated tests running on [Travis](https://travis-ci.org/rust-lang/
2. Style checker
- `rustc ci/style.rs && ./style src`

### Releasing your change to crates.io

Now that you've done the amazing job of landing your new API or your new
platform in this crate, the next step is to get that sweet, sweet usage from
crates.io! The only next step is to bump the version of libc and then publish
it. If you'd like to get a release out ASAP you can follow these steps:

1. Update the version number in `Cargo.toml`, you'll just be bumping the patch
version number.
2. Run `cargo update` to regenerate the lockfile to encode your version bump in
the lock file. You may pull in some other updated dependencies, that's ok.
3. Send a PR to this repository. It should [look like this][example], but it'd
also be nice to fill out the description with a small rationale for the
release (any rationale is ok though!)
4. Once merged the release will be tagged and published by one of the libc crate
maintainers.

[example]: https://github.com/rust-lang/libc/pull/583

## Platforms and Documentation

The following platforms are currently tested and have documentation available:
Expand All @@ -111,7 +130,7 @@ Tested:
* [`i686-apple-darwin`](https://doc.rust-lang.org/libc/i686-apple-darwin/libc/)
* [`x86_64-apple-darwin`](https://doc.rust-lang.org/libc/x86_64-apple-darwin/libc/)
(OSX)
* `i686-apple-ios`
* `i386-apple-ios`
* `x86_64-apple-ios`
* [`i686-unknown-linux-gnu`](https://doc.rust-lang.org/libc/i686-unknown-linux-gnu/libc/)
* [`x86_64-unknown-linux-gnu`](https://doc.rust-lang.org/libc/x86_64-unknown-linux-gnu/libc/)
Expand Down
2 changes: 1 addition & 1 deletion third_party/rust/libc/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ environment:
- TARGET: x86_64-pc-windows-msvc
- TARGET: i686-pc-windows-msvc
install:
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init.exe -y --default-host %TARGET%
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,24 @@ set -ex

curl -O https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip
unzip -q android-ndk-r13b-linux-x86_64.zip

case "$1" in
aarch64)
arch=arm64
;;

i686)
arch=x86
;;

*)
arch=$1
;;
esac;

android-ndk-r13b/build/tools/make_standalone_toolchain.py \
--install-dir /android/ndk-arm \
--arch arm \
--install-dir /android/ndk-$1 \
--arch $arch \
--api 24

rm -rf ./android-ndk-r13b-linux-x86_64.zip ./android-ndk-r13b
Loading

0 comments on commit 47d040e

Please sign in to comment.