Skip to content

Commit 6e0b39c

Browse files
jperkinjperkin
committed
rust: Update to 1.35.0.
Version 1.35.0 (2019-05-23) ========================== Language -------- - [`FnOnce`, `FnMut`, and the `Fn` traits are now implemented for `Box<FnOnce>`, `Box<FnMut>`, and `Box<Fn>` respectively.][59500] - [You can now coerce closures into unsafe function pointers.][59580] e.g. ```rust unsafe fn call_unsafe(func: unsafe fn()) { func() } pub fn main() { unsafe { call_unsafe(|| {}); } } ``` Compiler -------- - [Added the `armv6-unknown-freebsd-gnueabihf` and `armv7-unknown-freebsd-gnueabihf` targets.][58080] - [Added the `wasm32-unknown-wasi` target.][59464] Libraries --------- - [`Thread` will now show its ID in `Debug` output.][59460] - [`StdinLock`, `StdoutLock`, and `StderrLock` now implement `AsRawFd`.][59512] - [`alloc::System` now implements `Default`.][59451] - [Expanded `Debug` output (`{:#?}`) for structs now has a trailing comma on the last field.][59076] - [`char::{ToLowercase, ToUppercase}` now implement `ExactSizeIterator`.][58778] - [All `NonZero` numeric types now implement `FromStr`.][58717] - [Removed the `Read` trait bounds on the `BufReader::{get_ref, get_mut, into_inner}` methods.][58423] - [You can now call the `dbg!` macro without any parameters to print the file and line where it is called.][57847] - [In place ASCII case conversions are now up to 4× faster.][59283] e.g. `str::make_ascii_lowercase` - [`hash_map::{OccupiedEntry, VacantEntry}` now implement `Sync` and `Send`.][58369] Stabilized APIs --------------- - [`f32::copysign`] - [`f64::copysign`] - [`RefCell::replace_with`] - [`RefCell::map_split`] - [`ptr::hash`] - [`Range::contains`] - [`RangeFrom::contains`] - [`RangeTo::contains`] - [`RangeInclusive::contains`] - [`RangeToInclusive::contains`] - [`Option::copied`] Cargo ----- - [You can now set `cargo:rustc-cdylib-link-arg` at build time to pass custom linker arguments when building a `cdylib`.][cargo/6298] Its usage is highly platform specific. Misc ---- - [The Rust toolchain is now available natively for musl based distros.][58575] [59460]: rust-lang/rust#59460 [59464]: rust-lang/rust#59464 [59500]: rust-lang/rust#59500 [59512]: rust-lang/rust#59512 [59580]: rust-lang/rust#59580 [59283]: rust-lang/rust#59283 [59451]: rust-lang/rust#59451 [59076]: rust-lang/rust#59076 [58778]: rust-lang/rust#58778 [58717]: rust-lang/rust#58717 [58369]: rust-lang/rust#58369 [58423]: rust-lang/rust#58423 [58080]: rust-lang/rust#58080 [57847]: rust-lang/rust#57847 [58575]: rust-lang/rust#58575 [cargo/6298]: rust-lang/cargo#6298 [`f32::copysign`]: https://doc.rust-lang.org/stable/std/primitive.f32.html#method.copysign [`f64::copysign`]: https://doc.rust-lang.org/stable/std/primitive.f64.html#method.copysign [`RefCell::replace_with`]: https://doc.rust-lang.org/stable/std/cell/struct.RefCell.html#method.replace_with [`RefCell::map_split`]: https://doc.rust-lang.org/stable/std/cell/struct.RefCell.html#method.map_split [`ptr::hash`]: https://doc.rust-lang.org/stable/std/ptr/fn.hash.html [`Range::contains`]: https://doc.rust-lang.org/std/ops/struct.Range.html#method.contains [`RangeFrom::contains`]: https://doc.rust-lang.org/std/ops/struct.RangeFrom.html#method.contains [`RangeTo::contains`]: https://doc.rust-lang.org/std/ops/struct.RangeTo.html#method.contains [`RangeInclusive::contains`]: https://doc.rust-lang.org/std/ops/struct.RangeInclusive.html#method.contains [`RangeToInclusive::contains`]: https://doc.rust-lang.org/std/ops/struct.RangeToInclusive.html#method.contains [`Option::copied`]: https://doc.rust-lang.org/std/option/enum.Option.html#method.copied
1 parent bd4d324 commit 6e0b39c

7 files changed

Lines changed: 133 additions & 120 deletions

‎lang/rust/Makefile‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.100 2019/05/31 07:21:53 jperkin Exp $
1+
# $NetBSD: Makefile,v 1.101 2019/05/31 14:11:23 jperkin Exp $
22

3-
DISTNAME= rustc-1.34.2-src
3+
DISTNAME= rustc-1.35.0-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
55
CATEGORIES= lang
66
MASTER_SITES= http://static.rust-lang.org/dist/
@@ -149,42 +149,42 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
149149
# own bootstrap. See the stage0-bootstrap below for more details.
150150
#
151151
DISTFILES:= ${DEFAULT_DISTFILES}
152-
RUST_STAGE0_VER= 1.33.0
152+
RUST_STAGE0_VER= 1.34.2
153153
#
154154
.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi)
155-
RUST_STAGE0_VER= 1.33.0
155+
RUST_STAGE0_VER= 1.34.2
156156
RUST_ARCH:= i686-apple-darwin
157157
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
158158
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
159159
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
160160
pre-build-fix:
161161
.endif
162162
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
163-
RUST_STAGE0_VER= 1.33.0
163+
RUST_STAGE0_VER= 1.34.2
164164
RUST_ARCH:= x86_64-apple-darwin
165165
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
166166
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
167167
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
168168
pre-build-fix:
169169
.endif
170170
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
171-
RUST_STAGE0_VER= 1.33.0
171+
RUST_STAGE0_VER= 1.34.2
172172
RUST_ARCH:= i686-unknown-linux-gnu
173173
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
174174
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
175175
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
176176
pre-build-fix:
177177
.endif
178178
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
179-
RUST_STAGE0_VER= 1.33.0
179+
RUST_STAGE0_VER= 1.34.2
180180
RUST_ARCH:= x86_64-unknown-linux-gnu
181181
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
182182
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
183183
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
184184
pre-build-fix:
185185
.endif
186186
.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
187-
RUST_STAGE0_VER= 1.33.0
187+
RUST_STAGE0_VER= 1.34.2
188188
RUST_ARCH:= x86_64-sun-solaris
189189
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
190190
SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -193,23 +193,23 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
193193
pre-build-fix:
194194
.endif
195195
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
196-
RUST_STAGE0_VER= 1.33.0
196+
RUST_STAGE0_VER= 1.34.2
197197
RUST_ARCH:= i686-unknown-freebsd
198198
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
199199
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
200200
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
201201
pre-build-fix:
202202
.endif
203203
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
204-
RUST_STAGE0_VER= 1.33.0
204+
RUST_STAGE0_VER= 1.34.2
205205
RUST_ARCH:= x86_64-unknown-freebsd
206206
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
207207
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
208208
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
209209
pre-build-fix:
210210
.endif
211211
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
212-
RUST_STAGE0_VER= 1.33.0
212+
RUST_STAGE0_VER= 1.34.2
213213
RUST_ARCH= i686-unknown-netbsd
214214
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
215215
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -226,7 +226,7 @@ pre-build-fix:
226226
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
227227
.endif
228228
.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
229-
RUST_STAGE0_VER= 1.33.0
229+
RUST_STAGE0_VER= 1.34.2
230230
RUST_ARCH= x86_64-unknown-netbsd
231231
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
232232
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -306,19 +306,15 @@ post-extract:
306306
${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \
307307
fi
308308
# patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
309-
${CP} ${WRKSRC}/vendor/rand-0.5.5/.cargo-checksum.json \
310-
${WRKSRC}/vendor/rand-0.5.5/.cargo-checksum.json.orig
311-
${SED} -e 's/cb94a0b54e47022b2e9b58b45e0196785c61d083760333276226da435cc040d9/bcb195562cf830c9e2078757e6d0976f86ede59816ff305e21a2764a4a4cf43e/' ${WRKSRC}/vendor/rand-0.5.5/.cargo-checksum.json.orig > ${WRKSRC}/vendor/rand-0.5.5/.cargo-checksum.json
312309
${CP} ${WRKSRC}/vendor/rand/.cargo-checksum.json \
313310
${WRKSRC}/vendor/rand/.cargo-checksum.json.orig
314311
${SED} -e 's/1e732c2e3b4bd1561f11e0979bf9d20669a96eae7afe0deff9dfbb980ee47bf1/55abd8100db14a076dedbf84ce0f2db08158e1bd33ff1d4978bd3c4ad978f281/' ${WRKSRC}/vendor/rand/.cargo-checksum.json.orig > ${WRKSRC}/vendor/rand/.cargo-checksum.json
315312
${CP} ${WRKSRC}/vendor/libc/.cargo-checksum.json \
316313
${WRKSRC}/vendor/libc/.cargo-checksum.json.orig
317-
${SED} -e 's/7950a26f3eb0b7bc8e71f524cc2e05832b759fe2ce12a58e0c1957e0ec1286dc/a188bb00f0eddf252738f830b864e3a39bf2345f05f195d5ee5ca42b101f1de5/' ${WRKSRC}/vendor/libc/.cargo-checksum.json.orig > ${WRKSRC}/vendor/libc/.cargo-checksum.json
314+
${SED} -e 's/c6a740dac9af99321f48d5c9e86c6a4f5dcc611c413263881764f7121c1f7e9d/01ca1e6a21f01efd9d4b2768c1f9bcfab829e95a23d88cd35bf4e0172c672f3a/' ${WRKSRC}/vendor/libc/.cargo-checksum.json.orig > ${WRKSRC}/vendor/libc/.cargo-checksum.json
318315
${CP} ${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json \
319316
${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json.orig
320317
${SED} -e 's/59763fc255248b54fba5d0761d61093a73d51fa4cb400b0df1b5f339b9c2f48a/ba66d192421fd536ceddb50616c4c4aea06f4e39450eb0bc2bbbaed0b1e684c1/' ${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json.orig > ${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json
321-
322318
.if ${OPSYS} == "NetBSD"
323319
SDIR=${WRKDIR}/scripts; \
324320
${MKDIR} $${SDIR}; \
@@ -366,7 +362,7 @@ LDFLAGS+= -headerpad_max_install_names
366362
.PHONY: fix-darwin-install-name
367363
post-install: fix-darwin-install-name
368364
fix-darwin-install-name:
369-
. for bin in clippy-driver rls rustc rustdoc
365+
. for bin in cargo-miri clippy-driver miri rls rustc rustdoc
370366
otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \
371367
| ${GREP} '@rpath' | while read rpath rest; do \
372368
install_name_tool -change $$rpath \
@@ -441,7 +437,7 @@ stage0-bootstrap: install
441437
done
442438
for lib in libcrypto.so.1.0.0 libcurl.so.4 libhttp_parser.so.2 \
443439
libiconv.so.2 libidn2.so.0 libintl.so.8 liblber-2.4.so.2 \
444-
libldap-2.4.so.2 libnghttp2.so.14 libsasl2.so.3 \
440+
libldap-2.4.so.2 libnghttp2.so.14 libsasl2.so.3 libLLVM-7.so \
445441
libssh2.so.1 libssl.so.1.0.0 libunistring.so.2 libz.so.1; do \
446442
${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
447443
done

0 commit comments

Comments
 (0)