mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-07 11:49:40 +00:00
Code Issues Releases Activity

lang/rust-nightly: Update to 1.43.0.20200306

Browse Source 
libgit2-sys is now based on libgit2 0.99.0.  While 0.99.0 is supposed
to be API compatible with 0.28, it has not yet been updated in the
ports tree and the git2 crate now make use of some of the new
function return values.  Stop relying on system libgit2 and use the
bundled one.  Upstream does not make any guarantees about system
libgit2 support in the first place.

Changes:	6d69caba11...96bb8b31c8
This commit is contained in:
Tobias Kortkamp 2020-03-06 12:43:06 +00:00
parent 203d3dcd69
commit 0fadf15072
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527877
4 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/rust-nightly/Makefile
View File

@ -18,10 +18,10 @@ DISTINFO_FILE= ${.CURDIR}/distinfo
# Get latest from top level 'date' key in
# https://static.rust-lang.org/dist/channel-rust-nightly.toml
NIGHTLY_DATE= 2020-02-28
NIGHTLY_DATE= 2020-03-06
# See WRKSRC/src/stage0.txt for this date
BOOTSTRAPS_DATE= 2020-01-30
BOOTSTRAPS_DATE= 2020-02-29
RUST_BOOTSTRAP_VERSION= beta
CARGO_BOOTSTRAP_VERSION= beta

30
lang/rust-nightly/distinfo
View File

@ -1,15 +1,15 @@
TIMESTAMP = 1582866673
SHA256 (rust/2020-02-28/rustc-nightly-src.tar.xz) = 2afdf0d1144de4942f2a70aff1e14a7dbeaa6dad7748f252bc552ecdda967cd0
SIZE (rust/2020-02-28/rustc-nightly-src.tar.xz) = 94375080
SHA256 (rust/2020-01-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = de239e7838f913c1b4c03ec866b32966e83941a4797809f2baab2b07bb0b7225
SIZE (rust/2020-01-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 34914832
SHA256 (rust/2020-01-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f8ff7d3298374817cbe40c20ae131f9ed95a4271f952596b6581da52d655618f
SIZE (rust/2020-01-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16447192
SHA256 (rust/2020-01-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = ce5aa910f740219741342a092139a3b7278a7970c88b6f10966a3528a3bfc483
SIZE (rust/2020-01-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5018440
SHA256 (rust/2020-01-30/rustc-beta-i686-unknown-freebsd.tar.xz) = c3fdeb888e5bf7f98b82196f22553d97f93b4d486feae049c7b831049e3595b2
SIZE (rust/2020-01-30/rustc-beta-i686-unknown-freebsd.tar.xz) = 35156088
SHA256 (rust/2020-01-30/rust-std-beta-i686-unknown-freebsd.tar.xz) = 349f6534c6af0cb261523deaf497bb66158212d3a7bad2b7c748a4ed6abd269c
SIZE (rust/2020-01-30/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16429800
SHA256 (rust/2020-01-30/cargo-beta-i686-unknown-freebsd.tar.xz) = 009bc310c8702a56c7b39f2f401a0ce80b833c0371e67eb2f378ba5ab9257181
SIZE (rust/2020-01-30/cargo-beta-i686-unknown-freebsd.tar.xz) = 4918876
TIMESTAMP = 1583486976
SHA256 (rust/2020-03-06/rustc-nightly-src.tar.xz) = 58dcf0dabeb3486cf9290633c268590981dd482f2de30a7abe4b1b3f9919bc53
SIZE (rust/2020-03-06/rustc-nightly-src.tar.xz) = 94369264
SHA256 (rust/2020-02-29/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 209b3e2b0f1668a268e62ce8ee6b869b4e8c8828864595dd15815ea6eea588c3
SIZE (rust/2020-02-29/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 34878048
SHA256 (rust/2020-02-29/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28baffd9209a8a47afbcc3d8a496fb7e3980bad85aa462728d425967e3ad3634
SIZE (rust/2020-02-29/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16462244
SHA256 (rust/2020-02-29/cargo-beta-x86_64-unknown-freebsd.tar.xz) = c5c91049995d220b5b37d2e604078ea37be59c2d75653f0c7c3325cfecd99f98
SIZE (rust/2020-02-29/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 4962748
SHA256 (rust/2020-02-29/rustc-beta-i686-unknown-freebsd.tar.xz) = 8610178ba93efde35f25e4bcc201d993d6b061d23daf2b8c1b2d10f6c18ef2e2
SIZE (rust/2020-02-29/rustc-beta-i686-unknown-freebsd.tar.xz) = 35561440
SHA256 (rust/2020-02-29/rust-std-beta-i686-unknown-freebsd.tar.xz) = 8fcd828d923ea6800d9766cd8bbf233b8957919750c88720dcdf566a2eeb144c
SIZE (rust/2020-02-29/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16437120
SHA256 (rust/2020-02-29/cargo-beta-i686-unknown-freebsd.tar.xz) = d3c76fc156ae9e360f350e6aa88ac51c90dbdcf9b3596fdde00165b98753696a
SIZE (rust/2020-02-29/cargo-beta-i686-unknown-freebsd.tar.xz) = 4884180

30
lang/rust-nightly/files/patch-vendor_libgit2-sys_lib.rs
View File

@ -1,30 +0,0 @@
Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458
--- vendor/libgit2-sys/lib.rs.orig 2019-08-16 20:27:18 UTC
+++ vendor/libgit2-sys/lib.rs
@@ -331,7 +331,6 @@ pub struct git_remote_callbacks {
pub push_negotiation: Option<git_push_negotiation>,
pub transport: Option<git_transport_cb>,
pub payload: *mut c_void,
- pub resolve_url: Option<git_url_resolve_cb>,
}
#[repr(C)]
@@ -385,8 +384,6 @@ pub type git_push_negotiation =
pub type git_push_update_reference_cb =
extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int;
-pub type git_url_resolve_cb =
- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int;
#[repr(C)]
pub struct git_push_update {
@@ -2233,7 +2230,7 @@ extern "C" {
source: *const git_tree,
) -> c_int;
pub fn git_treebuilder_clear(bld: *mut git_treebuilder);
- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t;
+ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint;
pub fn git_treebuilder_free(bld: *mut git_treebuilder);
pub fn git_treebuilder_get(
bld: *mut git_treebuilder,

14
lang/rust/Makefile
View File

@ -29,16 +29,20 @@ ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64
ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap compiler
BUILD_DEPENDS= cmake:devel/cmake
LIB_DEPENDS= libcurl.so:ftp/curl \
libgit2.so:devel/libgit2 \
LIB_DEPENDS= libcurl.so:ftp/curl
.if !defined(NIGHTLY_DATE)
LIB_DEPENDS+= libgit2.so:devel/libgit2 \
libssh2.so:security/libssh2
.endif
USES= pkgconfig python:3.3+,build ssl tar:xz
MAKE_ENV= LIBGIT2_SYS_USE_PKG_CONFIG=1 \
LIBSSH2_SYS_USE_PKG_CONFIG=1 \
OPENSSL_DIR="${OPENSSLBASE}" \
MAKE_ENV= OPENSSL_DIR="${OPENSSLBASE}" \
RUST_BACKTRACE=1
.if !defined(NIGHTLY_DATE)
MAKE_ENV+= LIBGIT2_SYS_USE_PKG_CONFIG=1 \
LIBSSH2_SYS_USE_PKG_CONFIG=1
.endif
TEST_ENV= ${MAKE_ENV} \
ALLOW_NONZERO_RLIMIT_CORE=1