diff --git a/files/config.toml.in b/files/config.toml.in new file mode 100644 --- /dev/null +++ b/files/config.toml.in @@ -0,0 +1,13 @@ +[llvm] +ninja = true + +[build] +vendor = true + +[install] +prefix = "/usr" +sysconfdir = "/etc" +libdir = "LIBDIR" + +[rust] +channel = "stable" diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,11 +1,11 @@ name : rust -version : 1.18.0 -release : 31 +version : 1.21.0 +release : 32 source : - - https://static.rust-lang.org/dist/rustc-1.18.0-src.tar.gz : d2dc36e99b9e2269488b2bcddde43c234e6bde03edf70cba82a027ff49c36111 - - https://static.rust-lang.org/dist/2017-04-27/rustc-1.17.0-x86_64-unknown-linux-gnu.tar.gz : 3eebd92512040baf3c0974c3ce61859646d8cf422cc515d724d857577da0dbd5 - - https://static.rust-lang.org/dist/2017-04-27/rust-std-1.17.0-x86_64-unknown-linux-gnu.tar.gz : 2902bb0da78208f441f1d983aeafcad01ea653d2e062a8192892868e2b41130d - - https://static.rust-lang.org/dist/2017-04-27/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz : 3601e95c968850230b137b849ff08a507e50d77ab584c779143a100f1843d8dd + - https://static.rust-lang.org/dist/rustc-1.21.0-src.tar.gz : 1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa + - https://static.rust-lang.org/dist/2017-08-31/rustc-1.20.0-x86_64-unknown-linux-gnu.tar.gz : 000e776431718a32b5d40c4aa6e09b3425f0b71dea8c95e718d29b8c0f5b35d3 + - https://static.rust-lang.org/dist/2017-08-31/rust-std-1.20.0-x86_64-unknown-linux-gnu.tar.gz : a1b3e13b9d6f9aa713783145cb83070b1dabbe17349043b3528031d7712ca929 + - https://static.rust-lang.org/dist/2017-08-31/cargo-0.21.0-x86_64-unknown-linux-gnu.tar.gz : caccf4ab039c806a9e6fdc7fe389cc88fb771e28e30d93c07a5c56ef845cdf57 license : - Apache-2.0 - MIT @@ -32,21 +32,15 @@ export CXXFLAGS="$CFLAGS" # See /src/stage0.txt for the stage0 version and date the build system expects to find - export STAGE0_DATE="2017-04-27" + export STAGE0_DATE="2017-08-31" mkdir -p $workdir/build/cache/$STAGE0_DATE - ln -sv $sources/rust{c,-std}-1.17.0-x86_64-unknown-linux-gnu.tar.gz \ - $sources/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz \ + ln -sv $sources/rust{c,-std}-1.20.0-x86_64-unknown-linux-gnu.tar.gz \ + $sources/cargo-0.21.0-x86_64-unknown-linux-gnu.tar.gz \ $workdir/build/cache/$STAGE0_DATE/ mkdir -p $workdir/.bin ln -sv /usr/bin/ar $workdir/.bin/x86_64-solus-linux-ar export PATH="$workdir/.bin:$PATH" - ./configure --prefix=/usr \ - --libdir=%libdir% \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --release-channel=stable \ - --enable-vendor \ - --enable-ninja + sed -e 's:LIBDIR:%libdir%:' $pkgfiles/config.toml.in > $workdir/config.toml build : | unset LD_AS_NEEDED unset LDFLAGS @@ -57,7 +51,9 @@ export CXXFLAGS="$CFLAGS" export PATH="$workdir/.bin:$PATH" - %make + ./x.py build %JOBS% + ./x.py doc %JOBS% install : | export PATH="$workdir/.bin:$PATH" - %make_install + export DESTDIR="$installdir" + ./x.py install %JOBS% diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ rust - Ikey Doherty - ikey@solus-project.com + Nathan Caldwell + saintdev@gmail.com Apache-2.0 MIT @@ -33,71 +33,78 @@ /usr/lib64/rustlib/manifest-rustc /usr/lib64/rustlib/rust-installer-version /usr/lib64/rustlib/uninstall.sh - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-cac44891bdadbaa7.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_jemalloc-b4933d2651d1c0c2.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_system-6a53084a5db4ac3a.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libarena-ea506b1aa4f25d0c.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libbitflags-55f1040113bf5698.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libcollections-059a1d22431b3aee.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-9b9d372728ce3690.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libcore-faaabd8e03cecb71.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libenv_logger-ce961e3402c9f55b.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libflate-83603526ad44007f.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libfmt_macros-0eec5706d4b43ae5.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-8362dcb15f0b9ebb.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-8362dcb15f0b9ebb.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libgraphviz-53a1c6bc566808ca.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-021770c832536567.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liblog-077e47c68b7864b3.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-9ccb473e1706f4c0.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-879e7dcf9613eecb.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-dbd67d654d823403.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro_plugin-d606e116d378e18a.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libpulldown_cmark-bfa9bd04a3c2a0d5.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librand-9177f91f3b303986.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librls_data-c074c7508f9c194a.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librls_span-fb3d63bb2ebab0cc.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc-44ff78baa8933b07.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_asan-783151cfb92d70bd.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_back-92f1c9d6e64ebdaf.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_bitflags-572c09f21e2a71e2.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_borrowck-b0d2231103748647.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_const_eval-65f2433e1c97d414.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_const_math-4a1b81c6eb72bc03.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_data_structures-70b2415d2dd0be79.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_driver-0390f319aac2c63d.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_errors-e3a939a12482e81b.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_incremental-13c4b3c4ef714baf.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lint-f1639c4d1efd6ca2.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_llvm-6b27d80d6cc62b45.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lsan-085e5837ee68ee02.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_metadata-9bd680d197dc8250.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_mir-8e6352fbaab17f67.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_msan-e5fc26c0f10bb166.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_passes-27cd4abc5bb5dff8.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_platform_intrinsics-52e06ca691ca6f81.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_plugin-b6dfd291bcb06f44.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_privacy-726af5265ba4eb45.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_resolve-b3e2fd62ef2db856.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_save_analysis-851a2bc307a55357.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_serialize-fde13340fc7641e7.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_trans-823da257da9e3408.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_tsan-6c61f66aa5dba6a9.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_typeck-8e40cd9e1e5a706d.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustdoc-034735da68b36c40.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-cdf627b6f42ba8e6.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-cdf627b6f42ba8e6.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstd-12c94505da507d12.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstd-12c94505da507d12.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstd_unicode-4181c20076363c0a.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax-0cc209de930ba1ff.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_ext-17dae32a31ba1bda.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_pos-3e8e0bdace3e6150.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libterm-176d97c9d192c167.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libterm-176d97c9d192c167.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libtest-0a6418d759fc83b3.rlib - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libtest-0a6418d759fc83b3.so - /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-c64c8b90ba5fe4da.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-985ec50f8910816b.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_jemalloc-f62d2401300d3596.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_system-951431a904743b18.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libar-38896aa0712bd061.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libarena-100dedf2e588b944.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libbitflags-a87defec63a4e3b9.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libcollections-5ebfe32c1aed5d21.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-b2aa328460fec584.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libcore-015555de41d5b625.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libenv_logger-0ea9f4afcf4dea4b.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libflate2-34398154d7faa518.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libfmt_macros-b10519b02ab0fbbc.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-67dce7326cb4b6af.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libgraphviz-7810f173d3bf43dd.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libjobserver-3ef1a239392267bb.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-0df167219f750c33.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-aef3c67671b7525e.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/liblog-63ccd6d8dc99bbfe.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_sys-439dffd231c5c1c9.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libnum_cpus-613c394cf5d85e92.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libowning_ref-55da9425dd683abe.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-0ed61f7010a9c089.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-e0a4e97312c9fd7d.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-59f78d29ad465d79.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librand-45341a0fb57ff7d6.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librls_data-935bbce063f45b01.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librls_span-c125c46d16f08092.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc-5057218bc564f6e5.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_allocator-df518662ff468175.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_apfloat-02d5a71db1f923f5.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_asan-4e904c181a2ac66f.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_back-4a9424423ae01313.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_bitflags-a4169255a3167789.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_borrowck-48bfde1d2255f477.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_const_eval-e09cce9017cfb816.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_const_math-065d240186587fd1.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_data_structures-939ff1df38c51ab1.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-d509697dc3668d2d.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_driver-3de4eaef28fe90ac.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_errors-01faf864b6f8a1ae.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_incremental-2092873683a5bdf2.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lint-7bb5398d63f54691.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_llvm-b54ec214b353eec1.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lsan-a25a4877451aed5b.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_metadata-a05e6c258f3ff7f1.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_mir-7d011ed45d31e7f6.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_msan-194b8017b2a9084e.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_passes-ee2cf748336bd1de.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_platform_intrinsics-faa24e40a5ace1de.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_plugin-97fc76c559609627.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_privacy-543681d7d6b8d630.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_resolve-102f235b49275308.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_save_analysis-cc1c3bcee0702fdf.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_serialize-3d6fe724ea4a7501.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_trans-c893cab88df927c5.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_trans_utils-7393827cad7ca6f2.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_tsan-c240d7f9411fb98e.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/librustc_typeck-57b049d1c3629334.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-446fef65fa0ed3d3.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-446fef65fa0ed3d3.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstable_deref_trait-277b86a384e53eab.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstd-0dbe2a9dddc273d6.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstd-0dbe2a9dddc273d6.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libstd_unicode-d65e62e2df6fcdd5.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax-4208f54e2005ac2d.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_ext-685bb8c9620acd7d.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_pos-3e78c9befed79488.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libterm-61722866db4b3418.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libterm-61722866db4b3418.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libtest-1d1416ac2244a8b3.rlib + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libtest-1d1416ac2244a8b3.so + /usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-cae26a8c06e8f5f1.rlib /usr/share/man @@ -112,12 +119,12 @@ - - 2017-10-04 - 1.18.0 + + 2017-10-28 + 1.21.0 Packaging update - Ikey Doherty - ikey@solus-project.com + Nathan Caldwell + saintdev@gmail.com - + \ No newline at end of file