pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust wip update to 1.19.0
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Sat Aug 12 08:17:55 2017 +0300
Changeset: dfdccbbe213b98d5e7514a0212c9291efcb6b90e
Modified Files:
rust/Makefile
rust/TODO
rust/distinfo
rust/files/config.toml
Log Message:
rust wip update to 1.19.0
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dfdccbbe213b98d5e7514a0212c9291efcb6b90e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/Makefile | 22 +++++++-------
rust/TODO | 4 +--
rust/distinfo | 80 ++++++++++----------------------------------------
rust/files/config.toml | 46 +++++++++++++++++++----------
4 files changed, 59 insertions(+), 93 deletions(-)
diffs:
diff --git a/rust/Makefile b/rust/Makefile
index e7d6104ef1..7f0177c1e0 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2017/03/20 11:36:35 jperkin Exp $
-DISTNAME= rustc-1.18.0-src
+DISTNAME= rustc-1.19.0-src
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
CATEGORIES= lang
MASTER_SITES= http://static.rust-lang.org/dist/
@@ -20,19 +20,14 @@ UNLIMIT_RESOURCES+= cputime
USE_LANGUAGES= c c++11
GCC_REQD+= 4.8
-REPLACE_BASH+= src/rust-installer/gen-install-script.sh
-REPLACE_BASH+= src/rust-installer/gen-installer.sh
-CHECK_PORTABILITY_SKIP= src/rust-installer/gen-install*
-CHECK_PORTABILITY_SKIP+= src/grammar/check.sh
-
.include "../../mk/bsd.prefs.mk"
DISTFILES:= ${DEFAULT_DISTFILES}
-RUST_STAGE0_VER= 1.17.0
-CARGO_STAGE0_VER= 0.18.0
+RUST_STAGE0_VER= 1.18.0
+CARGO_STAGE0_VER= 0.19.0
# If this wrong, rust will begin fetching and creating these directories
# in rustc*-src/build/cache.
-CARGO_DIRNAME= ${WRKSRC}/build/cache/2017-04-27
+CARGO_DIRNAME= ${WRKSRC}/build/cache/2017-06-08
# Rust doesn't support pre-i686 Intel
.if ${MACHINE_ARCH} == "i386"
@@ -61,15 +56,18 @@ pre-extract:
${CP} ${DISTDIR}/${CARGO_STAGE0} ${CARGO_DIRNAME}
do-configure:
- ${CP} ${FILESDIR}/config.toml ${WRKSRC}/src/bootstrap
+ ${CP} ${FILESDIR}/config.toml ${WRKSRC}/src/bootstrap/config.toml
SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-configure
SUBST_FILES.paths= src/bootstrap/config.toml
-SUBST_SED.paths= -e 's,@@PREFIX@@,${PREFIX},'
+SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},'
do-build:
- cd ${WRKSRC}; ${PYTHONBIN} x.py build
+ cd ${WRKSRC}; ${PYTHONBIN} x.py build --verbose
+
+do-install:
+ cd ${WRKSRC}; ${PYTHONBIN} x.py install --verbose
# XXX tell it where rustc is
#do-test:
diff --git a/rust/TODO b/rust/TODO
index 2803b0da1d..fde8281760 100644
--- a/rust/TODO
+++ b/rust/TODO
@@ -1,7 +1,7 @@
IMPORTANT:
-Currently lacking an install / PLIST!
+lacking an install / PLIST! (XXX use DESTDIR?)
Need bootstrap for platforms for which upstream doesn't release binaries
-Fetching shit to ~/.cargo
+Fetching shit to ~/.cargo (XXX prepare combined tarball, use HOME as an environment variable)
Secondary:
Test target doesn't work
diff --git a/rust/distinfo b/rust/distinfo
index b8432e2144..3cafb50b8d 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -1,69 +1,21 @@
$NetBSD$
-SHA1 (cargo-0.18.0-i686-apple-darwin.tar.gz) = 2335103ed4ab1b5dff1908264dbea33b99ef68a6
-RMD160 (cargo-0.18.0-i686-apple-darwin.tar.gz) = 14e4949ccd24e081667154e56fbb184d666182a3
-SHA512 (cargo-0.18.0-i686-apple-darwin.tar.gz) = 4ba2032c021f4c6f26eb4035d53b17ab8e02efb25f259969eff8cdd7e040d37dce7856be0c9863f4ed9eb34a8f0cd31972a0d2b1ee0880e8b3466ab4fd58d947
-Size (cargo-0.18.0-i686-apple-darwin.tar.gz) = 3341274 bytes
-SHA1 (cargo-0.18.0-i686-unknown-linux-gnu.tar.gz) = 9c7efe58fdb980c6aeb9eb289f14b5c02f585dff
-RMD160 (cargo-0.18.0-i686-unknown-linux-gnu.tar.gz) = 03edc1546f6880c626b35c7e89d37ac1bf87ec72
-SHA512 (cargo-0.18.0-i686-unknown-linux-gnu.tar.gz) = 8f8bdaecc8d4bc9f79e5db853ad97eb6120db9371edac6e2abd5ae90ca47881befccd527e9eefcdb01a1f586bd72f4edc053cfa61e0cb76a11ad54151584d00d
-Size (cargo-0.18.0-i686-unknown-linux-gnu.tar.gz) = 4940463 bytes
-SHA1 (cargo-0.18.0-x86_64-apple-darwin.tar.gz) = e54a8dc5afe5240dcaa9578b582b6e886b5cb164
-RMD160 (cargo-0.18.0-x86_64-apple-darwin.tar.gz) = df796e385fab2e7ef0f040c1f744231738ac74b4
-SHA512 (cargo-0.18.0-x86_64-apple-darwin.tar.gz) = e1832a7dd9b994dfd78a587877de977ef4e2e454738061086b791df73439a5cd7f9aa734d6418b9c5e2dfadc2bbb648e395b88d676ec9b9beb9f661ed0f4c2f7
-Size (cargo-0.18.0-x86_64-apple-darwin.tar.gz) = 3627387 bytes
-SHA1 (cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz) = de3a369af554d6c65f623c299be58e75b6f76fe9
-RMD160 (cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz) = 5fc876bf4a48ea3765340e783b059c56b595744d
-SHA512 (cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz) = 84e459fbb848e7127d2c11c411edd0845aa4feb2638e45a6c71456fad9eb314b61ae9b5db6c9161a3455656614f4ab6685626a0f6d61a5b424162d676ba9556f
-Size (cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz) = 4996337 bytes
-SHA1 (cargo-0.18.0-x86_64-unknown-netbsd.tar.gz) = a58577d2162dce60492e137e7bf7afa9a5888e60
-RMD160 (cargo-0.18.0-x86_64-unknown-netbsd.tar.gz) = 77ba62cfb0a952de8ed3f71873ac22af97aec2f7
-SHA512 (cargo-0.18.0-x86_64-unknown-netbsd.tar.gz) = b4c1a9c801ef1eeef2ad023a1531b0c86bd5be9b319bcf1c622288431353902be4287805473e0e2ef63631e933b6d729a0b01b99863f51ac30fdc8d46cb7ce25
-Size (cargo-0.18.0-x86_64-unknown-netbsd.tar.gz) = 4456514 bytes
-SHA1 (rust-std-1.17.0-i686-apple-darwin.tar.gz) = 9c33e6ba6561b0f6e424137f5e9817876ff179c1
-RMD160 (rust-std-1.17.0-i686-apple-darwin.tar.gz) = 4082033f858183e90f0d9a355bafd098ffd60963
-SHA512 (rust-std-1.17.0-i686-apple-darwin.tar.gz) = a93e15659d23ed75d29a71923e34bb14bf68809239c95015c3735c62719e00e577eaee906ac0d446dfda3524d80a1e019c3d7b478893d8020ba5ccd86a55ad09
-Size (rust-std-1.17.0-i686-apple-darwin.tar.gz) = 45943447 bytes
-SHA1 (rust-std-1.17.0-i686-unknown-linux-gnu.tar.gz) = 800ff6efe430dde5a9b067de4ed90a99ed07c904
-RMD160 (rust-std-1.17.0-i686-unknown-linux-gnu.tar.gz) = 13f1d01388b2ff7d54dc93609f7920a8e7288279
-SHA512 (rust-std-1.17.0-i686-unknown-linux-gnu.tar.gz) = 49e3edccd63de0567dbed7ed9d7cabf331e40f88bbe550e2ed36b2ceda39ce153e7994e2123e6c18374d230a5a32064213462545ddaa881898b346c6cd1f20da
-Size (rust-std-1.17.0-i686-unknown-linux-gnu.tar.gz) = 54896638 bytes
-SHA1 (rust-std-1.17.0-x86_64-apple-darwin.tar.gz) = d965ba6741bd101b7db354c689d0c3b4d8dbd080
-RMD160 (rust-std-1.17.0-x86_64-apple-darwin.tar.gz) = 661b417ae7809f91efa04bb4ba232d28e444493f
-SHA512 (rust-std-1.17.0-x86_64-apple-darwin.tar.gz) = a99ffda55204672e04051c1026783641a2020f22150e3f90d0d25b4b5920d6b7abfe48eb60e5354f1a3ba4fc52a686a0a31350123d06d200087d82cf9c3d4a32
-Size (rust-std-1.17.0-x86_64-apple-darwin.tar.gz) = 46043567 bytes
-SHA1 (rust-std-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = d823658205a6a4a61f3b0c79d4970094b28d6ee6
-RMD160 (rust-std-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = 3812fcbf4bdfe683f5f67638123646f1f6e0b6ff
-SHA512 (rust-std-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = 83bd3118f02812fa1ffeeffacbc248cff5a0c0eec329e6e624bfee4a716f3f94ce464e1173695a753283e19352a4161fce095816be65bb59c14539b9b35ad11b
-Size (rust-std-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = 64603172 bytes
-SHA1 (rust-std-1.17.0-x86_64-unknown-netbsd.tar.gz) = 43364f5bf4da536b9f6cfcb992ab419e12c1f047
-RMD160 (rust-std-1.17.0-x86_64-unknown-netbsd.tar.gz) = 36666bf354a701e7a643afdd99700e4bf21624d9
-SHA512 (rust-std-1.17.0-x86_64-unknown-netbsd.tar.gz) = b9f401aa178b420f3ccfdb3ca4bdb9a3e37911792c7bbb432cf1b67f20fb3237ec0cb9b9c35bb3e00df968e2b77e97bf15bcd54f54103eecec3a1af2b46f9723
-Size (rust-std-1.17.0-x86_64-unknown-netbsd.tar.gz) = 54977038 bytes
-SHA1 (rustc-1.17.0-i686-apple-darwin.tar.gz) = ea394ac805b180e894131cdcfea69ae742c099e5
-RMD160 (rustc-1.17.0-i686-apple-darwin.tar.gz) = c5ea88332448b3cf439b1203ef4090484932aa21
-SHA512 (rustc-1.17.0-i686-apple-darwin.tar.gz) = 8e3673ab8fc22528fdc5274e81298d8a63b2338b67601e1dde33c26d9960e141991a4e92803cc4454eaf50a5dfd16d95411889173b723769f4b7fdfda8ab8372
-Size (rustc-1.17.0-i686-apple-darwin.tar.gz) = 34294697 bytes
-SHA1 (rustc-1.17.0-i686-unknown-linux-gnu.tar.gz) = 719deaf76e38f305cecf1abdceedc5a407811d06
-RMD160 (rustc-1.17.0-i686-unknown-linux-gnu.tar.gz) = d9cd312e8461eaba95b9508442383079dcf87461
-SHA512 (rustc-1.17.0-i686-unknown-linux-gnu.tar.gz) = b92f9bf26e329bba19eb7ae90006ac1811949da932562614faf651721c092af61a42d37d3ea1b51e8a6db46a12086283a5dc553dfa11da669a0aedb8bd7e4722
-Size (rustc-1.17.0-i686-unknown-linux-gnu.tar.gz) = 40762125 bytes
-SHA1 (rustc-1.17.0-x86_64-apple-darwin.tar.gz) = 917e95f158df98380f8b97e8c72253e8d58fb28f
-RMD160 (rustc-1.17.0-x86_64-apple-darwin.tar.gz) = ce8d694b2b6e5bf75f3ed0ff65da961655429065
-SHA512 (rustc-1.17.0-x86_64-apple-darwin.tar.gz) = 6b35bba0c4ae43d5df0095414da37fcceefc22d4ff09e6b1ada4491f2918ed96fc0a7cf1057284dbad139aec651fb8ea3eda6dde7b0d713bc8dff9d54770d981
-Size (rustc-1.17.0-x86_64-apple-darwin.tar.gz) = 34345106 bytes
-SHA1 (rustc-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = f8d89ead9877a63a7d6f84cbb04aa5f000550805
-RMD160 (rustc-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = 7e322a6cb09200843e3d6dd52202029cc4472b4b
-SHA512 (rustc-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = cb96f4026f6732bdce1a7c1c7a295d7da178a20087349f906a1ae245a46180d459cd302429d33e4d31b7b7e050d3f1327b061ecfd4ad3c88be4cca0bf3f5c2cd
-Size (rustc-1.17.0-x86_64-unknown-linux-gnu.tar.gz) = 38960208 bytes
-SHA1 (rustc-1.17.0-x86_64-unknown-netbsd.tar.gz) = bad2ab51977b88d0a8f82103695870f0dbfda43f
-RMD160 (rustc-1.17.0-x86_64-unknown-netbsd.tar.gz) = 71062fd9ab05180bbdeeb0e067449a2ebf7ffe18
-SHA512 (rustc-1.17.0-x86_64-unknown-netbsd.tar.gz) = e2cd56e2c5606f5a165894a7ff5a30b1ebda5c35f8ce87ee3edecd59bdd34fe9bc8cf855cff0f8cc82cb3e88851fe226af2f9969f5a0c9ebf766811981deba57
-Size (rustc-1.17.0-x86_64-unknown-netbsd.tar.gz) = 40739433 bytes
-SHA1 (rustc-1.18.0-src.tar.gz) = 1195775bea5c524d4033f03c7289b357d5dc4a84
-RMD160 (rustc-1.18.0-src.tar.gz) = 74640641b01c5b8efecae62672f561b712c5e21a
-SHA512 (rustc-1.18.0-src.tar.gz) = eff0460b647dfb3490e28d4dec4f9781d31a942f22de75d9bd1ba31591597226b6862ec5132e8b4fcdbcf6e6ffa085ca5dda7ff8260cd82388fc13e8d3b4a2eb
-Size (rustc-1.18.0-src.tar.gz) = 33111774 bytes
+SHA1 (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 969493ba707053fb7e87b85c99a1a16c1a55c920
+RMD160 (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 7d6e06332ceaea8f91e165703100e84d95530444
+SHA512 (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 68b9fcbff434e86b98f56da058d56ce630f31d0107ac3d6b1da2b224c1485adb72e48db70c1bd52b0f064098cc0c6b8055001ec8a83f2707fb747194a677f30b
+Size (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 4560096 bytes
+SHA1 (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 98efbc7a9a739472b9e5e4b4675a8dcf9a5930da
+RMD160 (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 87f429e28b4bc267a09a9679972da49933086e01
+SHA512 (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 2443f90032efd7b35d193d1dc73a1121f1bd2f6193bf4955fb25926359bee1c722160f6c7df0fb38949456b7fefea7bdd4240c051de8032881b2dfb5ac52e0c8
+Size (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 61732328 bytes
+SHA1 (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = d1501fe4ec858943668e8364aa79e8599b95f835
+RMD160 (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = 289d06ba7d8f8d3d4988492dd2acd786d5f990ff
+SHA512 (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = eab40e98fd58bd119837ba80ebcf0755a8125136952e5340f6f57cfa9e75a1a077c046e11377d32525c6d550f35f8499f381744a4c59e6171647e9082ea56248
+Size (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = 42502136 bytes
+SHA1 (rustc-1.19.0-src.tar.gz) = 846b7a8ce1f33c3fc5e0d3b0b4258540515d67a9
+RMD160 (rustc-1.19.0-src.tar.gz) = d044efd6f860571a332c3d9c629061f911ebd1d1
+SHA512 (rustc-1.19.0-src.tar.gz) = 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24
+Size (rustc-1.19.0-src.tar.gz) = 50108626 bytes
SHA1 (patch-src_compiler-rt_lib_builtins_CMakeLists.txt) = 288870c40b5e4ce29cbfb19cc9f56d35152c47fa
SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f
SHA1 (patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp) = 2899771b1a23be840b9305eff7e5e5f957239ccb
diff --git a/rust/files/config.toml b/rust/files/config.toml
index 9043725207..fe144c2aa8 100644
--- a/rust/files/config.toml
+++ b/rust/files/config.toml
@@ -15,10 +15,10 @@
[llvm]
# Indicates whether the LLVM build is a Release or Debug build
-optimize = true
+#optimize = true
# Indicates whether an LLVM Release build should include debug info
-release-debuginfo = false
+#release-debuginfo = false
# Indicates whether the LLVM assertions are enabled or not
#assertions = false
@@ -51,9 +51,7 @@ release-debuginfo = false
# support. You'll need to write a target specification at least, and most
# likely, teach rustc about the C ABI of the target. Get in touch with the
# Rust team and file an issue if you need assistance in porting!
-#
-#### Excluding targets that are never encountered on pkgsrc! ####
-targets = "X86;ARM;AArch64;Mips;PowerPC;Sparc"
+#targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX;Hexagon"
# Cap the number of parallel linker invocations when compiling LLVM.
# This can be useful when building LLVM with debug info, which significantly
@@ -61,9 +59,7 @@ targets = "X86;ARM;AArch64;Mips;PowerPC;Sparc"
# each linker process.
# If absent or 0, linker invocations are treated like any other job and
# controlled by rustbuild's -j parameter.
-#
-#### Wreaks havoc on RAM usage at build time ####
-link-jobs = 1
+#link-jobs = 0
# Delete LLVM build directory on LLVM rebuild.
# This option defaults to `false` for local development, but CI may want to
@@ -92,11 +88,11 @@ link-jobs = 1
# for each target triple.
#target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
-# Instead of downloading the src/nightlies.txt version of Cargo specified, use
+# Instead of downloading the src/stage0.txt version of Cargo specified, use
# this Cargo binary instead to build all Rust code
#cargo = "/path/to/bin/cargo"
-# Instead of downloading the src/nightlies.txt version of the compiler
+# Instead of downloading the src/stage0.txt version of the compiler
# specified, use this rustc binary instead as the stage0 snapshot compiler.
#rustc = "/path/to/bin/rustc"
@@ -146,7 +142,7 @@ link-jobs = 1
#extended = false
# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
-#verbose = 0
+verbose = 2
# Build the sanitizer runtimes
#sanitizers = false
@@ -156,13 +152,27 @@ link-jobs = 1
# known-good version of OpenSSL, compile it, and link it to Cargo.
#openssl-static = false
+# Run the build with low priority, by setting the process group's "nice" value
+# to +10 on Unix platforms, and by using a "low priority" job object on Windows.
+#low-priority = false
+
# =============================================================================
# General install configuration options
# =============================================================================
[install]
# Instead of installing to /usr/local, install to this path instead.
-prefix = "@@PREFIX@@"
+prefix = @PREFIX@
+
+# Where to install system configuration files
+# If this is a relative path, it will get installed in `prefix` above
+#sysconfdir = "/etc"
+
+# Where to install documentation in `prefix` above
+#docdir = "share/doc/rust"
+
+# Where to install binaries in `prefix` above
+#bindir = "bin"
# Where to install libraries in `prefix` above
#libdir = "lib"
@@ -170,15 +180,15 @@ prefix = "@@PREFIX@@"
# Where to install man pages in `prefix` above
#mandir = "share/man"
-# Where to install documentation in `prefix` above
-#docdir = "share/doc/rust"
-
# =============================================================================
# Options for compiling Rust code itself
# =============================================================================
[rust]
# Whether or not to optimize the compiler and standard library
+# Note: the slowness of the non optimized compiler compiling itself usually
+# outweighs the time gains in not doing optimizations, therefore a
+# full bootstrap takes much more time with optimize set to false.
#optimize = true
# Number of codegen units to use for each compiler invocation. A value of 0
@@ -304,3 +314,9 @@ prefix = "@@PREFIX@@"
# Note that this address should not contain a trailing slash as file names will
# be appended to it.
#upload-addr = "https://example.com/folder";
+
+# Whether to build a plain source tarball to upload
+# We disable that on Windows not to override the one already uploaded on S3
+# as the one built on Windows will contain backslashes in paths causing problems
+# on linux
+#src-tarball = true
Home |
Main Index |
Thread Index |
Old Index