From owner-svn-ports-all@freebsd.org Mon May 29 05:00:55 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB95ED86EBE; Mon, 29 May 2017 05:00:55 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7ECE918BD; Mon, 29 May 2017 05:00:55 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4T50sEn094806; Mon, 29 May 2017 05:00:54 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4T50sFD094804; Mon, 29 May 2017 05:00:54 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201705290500.v4T50sFD094804@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 29 May 2017 05:00:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441966 - in head/lang/rust: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2017 05:00:55 -0000 Author: riggs Date: Mon May 29 05:00:54 2017 New Revision: 441966 URL: https://svnweb.freebsd.org/changeset/ports/441966 Log: Fix build on pre-ino64 / on i386 Submitted by: kib Differential Revision: https://reviews.freebsd.org/D10973 Modified: head/lang/rust/Makefile head/lang/rust/files/extra-patch-ino64 Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Mon May 29 04:16:00 2017 (r441965) +++ head/lang/rust/Makefile Mon May 29 05:00:54 2017 (r441966) @@ -134,7 +134,7 @@ pre-fetch: exit 1;\ fi -LIBSTD= rust-std-1.16.0-x86_64-unknown-freebsd/rust-std-x86_64-unknown-freebsd/lib/rustlib/x86_64-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib +LIBSTD= rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd/rust-std-${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/rustlib/${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib STDF= std-aef6cb139bd07bdc.0.o post-extract: @@ -143,6 +143,10 @@ post-extract: ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} +.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1200031 + ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \ + ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} +.endif ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} ${TAR} -x -C ${WRKSRC} -f ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} @@ -152,7 +156,7 @@ post-extract: ${LD} -r -o ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} ${WRKSRC}/old_fstat.o ${MV} ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} (cd ${WRKSRC} && ${AR} r ${WRKSRC}/${LIBSTD} ${STDF}) - ${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-1.16.0-x86_64-unknown-freebsd + ${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd ${MV} ${WRKSRC}/rustc.tbz ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP} .endif Modified: head/lang/rust/files/extra-patch-ino64 ============================================================================== --- head/lang/rust/files/extra-patch-ino64 Mon May 29 04:16:00 2017 (r441965) +++ head/lang/rust/files/extra-patch-ino64 Mon May 29 05:00:54 2017 (r441966) @@ -41,16 +41,16 @@ pub st_gid: ::gid_t, + pub st_pad1: ::uint32_t, pub st_rdev: ::dev_t, -+ pub st_atime_ext ::i32, ++ pub st_atime_ext: ::int32_t, pub st_atime: ::time_t, pub st_atime_nsec: ::c_long, -+ pub st_mtime_ext ::i32, ++ pub st_mtime_ext: ::int32_t, pub st_mtime: ::time_t, pub st_mtime_nsec: ::c_long, -+ pub st_ctime_ext ::i32, ++ pub st_ctime_ext: ::int32_t, pub st_ctime: ::time_t, pub st_ctime_nsec: ::c_long, -+ pub st_birthtime_ext ::i32, ++ pub st_birthtime_ext: ::int32_t, + pub st_birthtime: ::time_t, + pub st_birthtime_nsec: ::c_long, pub st_size: ::off_t,