Date: Fri, 15 Feb 2019 09:33:49 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492987 - head/Mk/Uses Message-ID: <201902150933.x1F9Xnxv096767@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Fri Feb 15 09:33:48 2019 New Revision: 492987 URL: https://svnweb.freebsd.org/changeset/ports/492987 Log: Don't break when there are multiple libc versions in crates. Modified: head/Mk/Uses/cargo.mk Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Fri Feb 15 09:18:41 2019 (r492986) +++ head/Mk/Uses/cargo.mk Fri Feb 15 09:33:48 2019 (r492987) @@ -134,16 +134,16 @@ CARGO_ENV+= GETTEXT_BIN_DIR=${LOCALBASE}/bin \ GETTEXT_LIB_DIR=${LOCALBASE}/lib .endif -.if ${CARGO_CRATES:Mlibc-[0-9]*} +.for libc in ${CARGO_CRATES:Mlibc-[0-9]*} # FreeBSD 12.0 changed ABI: r318736 and r320043 # https://github.com/rust-lang/libc/commit/78f93220d70e # https://github.com/rust-lang/libc/commit/969ad2b73cdc -_libc_VER= ${CARGO_CRATES:Mlibc-[0-9]*:C/.*-//} +_libc_VER= ${libc:C/.*-//} . if ${_libc_VER:R:R} == 0 && (${_libc_VER:R:E} < 2 || ${_libc_VER:R:E} == 2 && ${_libc_VER:E} < 38) -DEV_WARNING+= "CARGO_CRATES=libc-0.2.37 or older maybe unstable on FreeBSD 12.0. Consider updating to the latest version." +DEV_WARNING+= "CARGO_CRATES=${libc} may be unstable on FreeBSD 12.0. Consider updating to the latest version (higher than 0.2.37)." . endif .undef _libc_VER -.endif +.endfor .if ${CARGO_CRATES:Mlibgit2-sys-[0-9]*} # Use the system's libgit2 instead of building the bundled version
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902150933.x1F9Xnxv096767>