# ChangeLog for dev-lang/rust
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.10 2015/01/12 18:07:32 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/ChangeLog,v 1.11 2015/02/10 11:35:29 jauhien Exp $
+
+*rust-1.0.0_alpha (10 Feb 2015)
+
+ 10 Feb 2015; Jauhien Piatlicki <jauhien@gentoo.org>
+ +files/rust-0.13.0-no-ldconfig.patch, +rust-1.0.0_alpha.ebuild,
+ -files/50rust-mode-gentoo.el, -files/rust-0.11.0-libdir.patch,
+ -files/rust-0.11.0-stage0.patch, -files/rust-0.12.0-libdir.patch,
+ -files/rust-0.12.0-no-ldconfig.patch, -files/rust-0.12.0-stage0.patch,
+ -rust-0.11.0-r2.ebuild, -rust-0.12.0.ebuild, -rust-999-r1.ebuild,
+ -rust-9999-r3.ebuild:
+ version bump, remove old versions, move all live stuff to the rust overlay
12 Jan 2015; William Hubbs <williamh@gentoo.org> metadata.xml:
add myself as a maintainer
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 50rust-mode-gentoo.el 99 SHA256 8edbc05ca285e72963bfbf8c62fcf8b81af03f8127fde7e0cd0e44bbe38070bf SHA512 af3612e7a044823c14248a4d45d53a108f5b7c3c40bd7644adf67a9f0ef00d701fc5b9f17c977f0a0fab13ff76a4e221a9000e7cbb7dd6264b1387e39b9bd14e WHIRLPOOL 8ade2d3a0184dc5e9805dae0b136cdd11cad12fd08546db5438f6a575589447ab8f1cd28aee7110f6aa13dc4f0be57672edc619f2a9726b252779bd5988cb229
-AUX rust-0.11.0-libdir.patch 8231 SHA256 c86ed1af308cc0a3486afe406bdbfcb5a4e56bef3e897ec929d104682019fdfe SHA512 08f217cad02b4f7c30fd8431ffa5a1f7d5475d5d7b026e150dabbbc822fe14529dbbc87b08f4d7f05a620076e78ca5c44f7e61ddbe2adcb6fa9f99c2704c2fdc WHIRLPOOL 807305adf449591252a6f6dbc79a482c598fa38c1b678e9ba539ae46bc7b7a0262186fb4d1b5e416730118f67bc8332d45f6ffae1ef115f46c2a9c4b26d39a75
-AUX rust-0.11.0-stage0.patch 843 SHA256 e6a583757f625506da2f19526211b8ec11067566e5b28ea225ac0034081d0ab5 SHA512 84a31d006b0620096d8e224e2a0f429ea3a9bd3befccfd72c82872cd1a32b1e7be0394b5cee2dd5b777e89480f9469e05343b975c7ab4015893d85e6ed8a8156 WHIRLPOOL 53b47116705e5aef97dbe457fdee970f0b5665cbeaf78c12b97ecb0d8c0c92c8596e73ea1ddcb15a3bd8abe5771a41080aa316296c37ef164c423a91fb8bb8b1
-AUX rust-0.12.0-libdir.patch 3802 SHA256 de21b4115126bd8f90e1afd553d1d856e4a0c56323f26dc2d1c415e73c191fde SHA512 d7bc2a63bcaae9a4f1d623fa9a716f66eeafc965c2968b2cbcf789d46254e0499e1f2a5438b103cc3a58c5ab8074172eefb383eab080dabbf5686519f7d87f64 WHIRLPOOL 859b141c0a39eca960d6a9f305c4fd04a74d7e723dae13d19aea35f0c98af208fc613e2facf3e2d07527e634565071b6e21d154e9261aaeff363c308fcdeb60a
-AUX rust-0.12.0-no-ldconfig.patch 805 SHA256 0b7d7dc918ada3ba9a3ab638abb06bbd99e7d4b80d890ed64afe4cce00f11a99 SHA512 798f4e0a87f604f3cbd0c1f8d17144a97c62b37f20b4db18049d1bf18a24997e5e9b636e164055fa07a3ee6115b0eda0aad4229f78d09052ea75e805995965da WHIRLPOOL 727dcb8a22d4c9bd08f1c6cba84c5abe25b43be624b63ba1b7acfe4aea2c3a10283c0bc7b652fdaf83f0de032ff824ed3beb8489d5a27cbe21131ba25557d064
-AUX rust-0.12.0-stage0.patch 10172 SHA256 3f3921775b4e642d74f3b48d7ca1f670092cd1b7cd9a5cacfcbfa83399afd53a SHA512 924c45ceccf90679ca113ef0e7022a6ae443ab6fa522b3dda34b7592e48241acca4e84871b7bd3917692cf57b264f98590ab00aab7130a25899deaf7b56ee9c8 WHIRLPOOL ddf7ba70d88f61227ec02cdd69b3a92d889e8f54c3abb4fb6573b06f67aab5a14e3ccd9e1d75355ed7887da284c49b95bc6e910b6198b443a5b7ba1f80db22d0
-DIST rust-0.11.0-i686-unknown-linux-gnu.tar.gz 96998445 SHA256 cbfe2050f708479f2625a935d2f41165868f354ff740d2697e08acb2255670b2 SHA512 ed9213ed97351cc7ee30aa4b1177389147771ccaf8d7aa5356cecdb082966a3c5469e08f2693cb840854da523c496c90c47fa3370ceae493638efe82d5994289 WHIRLPOOL baf470655ce9229fad58db537d1fc7d34e5b858d8a06dd94690e0403d0b8d111ed41c22cf1366c7145e22c0ed55851c0bbb56db5d2408c62931c7f76f2a02352
-DIST rust-0.11.0-x86_64-unknown-linux-gnu.tar.gz 97323861 SHA256 331d6374b3c8fca3e2b5fffb65ce75dfce3529bd47333de4a9ce636cb87be432 SHA512 2f98028ddaf9900150fde0bc94f2ffe28a21def3e3c84ffc3d3e5e80ee8b6d5c7010ab01dedf43b768c1c9d356041cf102b43696805f9e15bded2377206510db WHIRLPOOL dd4fcdc4f85fb4aea60cb9b547b4f242b107c3f49f478e10902bf820032b4f620af85a335059bc0fa99e2159be3e66a80a6ea76d193c7643e9cda4c168fd9f5f
-DIST rust-0.11.0.tar.gz 21555837 SHA256 d1b3e36448bf12b8c9289024df416de10774b6d3235d7b1d22b248ef634411ba SHA512 a29e8a1c44097cc78d36d637d1ebf9b1b914d58a56d52f8112959a68916a2df9f5f63f93e596ba6db5be21a962912503e0fd678330a9dac6abe04a59d5af4584 WHIRLPOOL b7fb24920aca2a537af0c7e20925302a20fbd662209a1774a8ecc7c2cf9aaeb9b4fabfdd45620a0fda88b49122abc04882f7254a984b06df47212e537f8713f8
-DIST rust-0.12.0-i686-unknown-linux-gnu.tar.gz 110403651 SHA256 2a96a5662e1248da0c2dc3394646b7e75b2c05b2df332cb6f388bbbb6cb75999 SHA512 466234164e9dea906f2adcce8a4eb423fbce729171ec865cc3162b2c6b73166cbe4b4dad98cd342555ed35497dddde9c9e04b80a607d8862923e05931c406ecc WHIRLPOOL a0244cf7ed0de3417da7e982043c219cd91c08ecfba919bc6ffac9adf632f937bb21d403d1ba5ccc31e6fc44192f3954ed900ecaffc874320b67d879bfab18af
-DIST rust-0.12.0-x86_64-unknown-linux-gnu.tar.gz 110096209 SHA256 bb3e2eda2bd25690c58a3925ca175dedc27fedada33af4159fdb63dae9cc41a3 SHA512 1e08408cd8c8900fba637ce69efeb3ef565323c80aa94bda8679a667d19b16c2c10daa527a54ea401d49537aebfda825e44d690c3e99c025aa8e5ebd1b79c5fe WHIRLPOOL 63cf0b46f51c2010a7485427b179f02baa3a9e7e4a277df70617b50a603fda75591e74d5e4a263ab964e7f6c88ff3713e437a9967879428742431840ca970abf
-DIST rust-0.12.0.tar.gz 21223176 SHA256 883e66b24d90d9957c5c538469fcde6f0668e5fb6448beecfc60884060e769b7 SHA512 b01f6ae97fb012ab701b47a8f240a764d0a6f3ee2224ab67289c61f021a1cef2e99a4b61aa3f8991ce90f52b19d6ec93a5a041e5ee4988803e6ef239c8b91445 WHIRLPOOL 8f952936f06d95c4eba4803752d690831d9e60b5f66e289d5c9083108f66bae403917c42744d4a611d636a69c2bd11d69c51c59ce3f899fe3fa94d15e30c4cfd
-EBUILD rust-0.11.0-r2.ebuild 2681 SHA256 592ae50e12baba81a43cdc32fde8d533524e34ca6bf27098fe0179a1f8d93102 SHA512 1a8f9b793101716f39d6c1738ca160911f5879eee754da919d2a500240fa0da21ea136c10951811f43f85667ce0865fb9221c4be709f4bc809b40a91bbbd6a6a WHIRLPOOL 9a951c8b438546a776c16d3d4ba16bd3e94a9bc1ec76c18b983d772f81aac927635a7d854fb106ba3c3d37af9b13c832992c93caf7298b8005261e4838d4c595
-EBUILD rust-0.12.0.ebuild 2853 SHA256 f42641ffbe5099412673e31b1af817858fc4e9c0f5fa502f473d3a7ee332af9d SHA512 13598476ec6020017b5e8ede25996d7bc86ced6da926245a6768a1f62127c86606d190db517150a58ef8069f9aa23053cb60efe99f16a0cb4fc8548c881f1def WHIRLPOOL 738f9db1280d23da4c040b1362ff9f90c751c7a2c4a5b21eb8cc76b3fe18e66f5efea027962bf9dff4dc2a796525a2e9328d7d3640411426ad16562a7a252a91
-EBUILD rust-999-r1.ebuild 3324 SHA256 2a505cbca6a99c6ca28bcf1d19e0b94882013be255bf1aca9630795fea4076aa SHA512 3037c51058658e863b625b491050c967c3a6eb680f2f0baa189da5e63c1f0f8a2e16738bd583dc8329998cee6782e3b2683627f185a407418c6e934d17fa7b09 WHIRLPOOL dfb35c82495f77487f0ddc0f3864b9325d212bb3e5e5dc4a01a9a6a6be631c3b848ecee3d233dd535b89153524d3177b53f4e97d90bb2132c5ee0ea263b50b68
-EBUILD rust-9999-r3.ebuild 3217 SHA256 ca1a5ace8ff36674dcd8c9aa0c64f6ee54eee9454fc4b1c31da7baf9ca2e8d1c SHA512 8d669c6e501ff0c15e26d95742fa9c5a0003c9c47f303b94c3b19a1598fe9170ae3312e4f49eb18e9232e267f61cc94ade741f3b7bb24364356366ca666f2585 WHIRLPOOL 885c31c6f6093077efcc9a8936d3b3ea95d69e8324e7304acdfffc33dac3b403ebe1da032f38268d7e9124e6eacf5bb35346a074c2c5f87116eb504ff91a0fa5
-MISC ChangeLog 2424 SHA256 ee5b9fd3824d58a6cb898d3c2d9fa9981d542f8ab67da194b646a894fc26fae3 SHA512 17581621df002b4c16b21127d9c4782ecd678e076b8dfc1f3dff5b31b61aa8591666b92e51435e8e1c33bcbc5215b5a8dc8b567c0448cfe8529be7adff5034ea WHIRLPOOL 2a7742a1c33d776d0bffa9418eba4e7bedfe5411496b4d54f27869d9f18876302085e04681263c43b19ec11ee9c7a00682e3187e403a828c2051863fe2aa1258
+AUX rust-0.13.0-no-ldconfig.patch 953 SHA256 069daaf97a35815eb86bfe49da03f0cea9ef2fcf6508260161ba2df7a893ab58 SHA512 67a7696b12d05d72268fbbf0712ce0e8f6699d1a57911b493de6181386912f109d153d4416c1875a5001bd8a2e9b63ce358d6f201a36003b1c6f1fadbd436b4f WHIRLPOOL b3221d197d2519dc06fc35369640b3d81f5aa136505f1dbcc80b4678347c0b23eac34e0e98c4c4e3538f5dbe25431aff22c34250acc7467329832e1a007fc6d0
+DIST rust-stage0-2015-01-07-9e4e524-linux-i386-d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4.tar.bz2 17018260 SHA256 eed180a34b69e3dc4c04a69255e819cb4c2d84b150fa43974aa55475fb886308 SHA512 804342c8d01e546d0a9ae2158498add752d91c7c36add6250c800d3f3aa67bbb9f5b510af12b2a51845ea533363bcf17ba992daa0ead0d5c3bb470625f2c3e86 WHIRLPOOL e5d0040b76286c93a704bc03131006152336d8420952c28364bc5e9a7c18a088fe697087ddbbd9df0cc9e1ca0e5a67d65be5123f7c308ad196fed40135516fcd
+DIST rust-stage0-2015-01-07-9e4e524-linux-x86_64-697880d3640e981bbbf23284363e8e9a158b588d.tar.bz2 16662646 SHA256 0e417b7970231c7687bb502826b6697d7329da0533743dc94e52046ecf6b18a4 SHA512 0291699331cee6635fe708ef6891f899089f527b3d26972742b5e3478f68f184166e48d40a28a9450c32ea1737b437bfa89712590e3dbdbd11ce4d9978190319 WHIRLPOOL 86195d3b296e064196a437cec4c3dc5f58b1de830c5d31647e4f5c2073d6a8757b595836bfc5a7fb38ffc693b51bf59de6cdaf8a0fdf3099696bda696c058921
+DIST rustc-1.0.0-alpha-src.tar.gz 21344613 SHA256 3a2285726e839fc57ad49ed8907a50bab2d29d8f898e2d5a02f620a0477fc25c SHA512 7285f1a90e75b31d4455a025a93fbdc590203e0875e3c1845df99e20d92a880573dff8ccb9d0ab4e85f64208a4eb46f5f71dd0c7def8e3d589021b90714d7b06 WHIRLPOOL 827b18b363ccde654499b616937df76daaf8b43bf76af2ac438006c3f0d71540df41d1cd109f58822627c9aea1be9f106ced3ff82630e965fce62f82bbceae75
+EBUILD rust-1.0.0_alpha.ebuild 4066 SHA256 b06477bd875077c1b005e534eaab25a1f03a21f889b5f1339253980697fcae3c SHA512 2cd1cdc45ab489ba76fc4192b42d537a757e016536b9b493febb6f8db5d62e1da4c553d864adc418cf6925eabcc53d348a95fff077cea2519b7a2b6a02d6e43d WHIRLPOOL 2301408228c4dd79473a7ef4af72582e5c7f1fc10893ddc680c6966eea40c93099c0b356e43e8f088b49d35a929532535391ea7ac7a616e11a5bd778ff6c4613
+MISC ChangeLog 2952 SHA256 5178b5c65201c08e29431e8e877492ef56b2cbd4315b41b6f246ac98d3ef3ac1 SHA512 d99b01f971c1954180539d93e675b591f16bcb72627f51f2d02ec88a19a788a4bfa77cbfd769279a670d8c282890f039574bab09f344f7aa67c5094cd3064efe WHIRLPOOL 25942ab048d797d58d17599a1b8fee52e843cf1d19e42342ed65b5d309253ed6d44081b8f9bfa87dc3a2f66b8ee9be72eb1bd39f41acd8fb9ee57466f7c32986
MISC metadata.xml 741 SHA256 dc03d5b42fa933f3f261f06c02f6723e8847dd581ba1fa337d86fc6e742194ce SHA512 0e5dff49657f0dd2b79db65140c7154d6a1256bf5415570c28b057858680fe78ddecdaa53a5066290a46e146f115790bccdd1bf32309cd0b6b62b5714e1df45e WHIRLPOOL fa8f678aa025da4f6487f23ee8b4dd1056d3affd9c52a9cb4287390cc461fa9e5c77796f407eb576b2757f6ee81d44382d5fb975015ebbe3629af2e8c424b2d4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlS0D1YACgkQblQW9DDEZTijGACfaMPRkof65Z/wEuCtYr76CKDe
-KlwAoKwHlWZCtpBrOMu3abVkBcYR6ptX
-=uSq2
+iQIcBAEBCAAGBQJU2e0CAAoJELvuk32y76HUS6kP/jRXkKt6xw/YUo29Pw9iqWVa
+p4cvjxJJdrwmGZyUAkTQ/hLNbwZgYusE4UaToq+nrXhMUo4Wv3dRCqYC3IaPp3//
+37bAAEiKcvie3Vr9wfQW/fs1phT94p8pB4Yuv67vJizjhZSorJSGeKe1l+Qkdh/l
+7fxw3Yi3vYqwfd7N7I8lRQ9AM3BHniyRZSQxkWjEY2xgnMaG+fzWm5vgrPa5SIDq
+bplz6FR54Q1GPxaDPkyceyzvb1id+FSHmHM4tUGhqLF6kmD3Mzobp6ONny5M0kg6
+cupr+qnfMy2AsVEmeTqhhq+PTO3J9rUeNru1Ft5oR/KhZM9UFU01gTRQQdt/WfRx
+Q7HbYHmamUTJR1i/M0m+UFTK74P8hkvm6EFyQce1LSg323jGKJoffdtOuWGksnFo
+P6vd+J00JyokNgQI/nwRAkSa1QFpf2yqpU0KwpiTN21x75vH23Q5Fh4yMkivdp/E
+lLDsB2WTSvxts6GVaWOY9P2RyOIUn5wA4D9DO+E0rcJM3yOsTmM4iwqtOvNbaCgo
++C5LzwNm7yqdpxko2zncARduZK/bv7sUXAizsXHz8FJozNNbqwJ4h+E+cQe96Mes
+QJ2NPCwA2OkTHg4HE2pbTbtPjZkjeXBmbqbiQrRR2iuTO/hNEEFWXJgd18oqYcwX
+dirgEiMUoFTDnQLKIh9/
+=JpCO
-----END PGP SIGNATURE-----
+++ /dev/null
-
-;;; rust-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'rust-mode)
+++ /dev/null
-This patch adds proper support for --libdir configure option
-See https://github.com/rust-lang/rust/issues/11671 and
-https://github.com/rust-lang/rust/pull/16552
-
-diff -r -u rust-0.11.0.orig/configure rust-0.11.0/configure
---- rust-0.11.0.orig/configure
-+++ rust-0.11.0/configure
-@@ -453,6 +453,14 @@
-
- valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
-
-+case "$CFG_LIBDIR" in
-+ "$CFG_PREFIX"/*) CAT_INC=2;;
-+ "$CFG_PREFIX"*) CAT_INC=1;;
-+ *)
-+ err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- if [ $HELP -eq 1 ]
- then
- echo
-@@ -838,6 +846,15 @@
- do
- for t in $CFG_TARGET
- do
-+ # host lib dir stage0
-+ make_dir $h/stage0/lib
-+
-+ # target bin dir stage0
-+ make_dir $h/stage0/lib/rustlib/$t/bin
-+
-+ # target lib dir stage0
-+ make_dir $h/stage0/lib/rustlib/$t/lib
-+
- for i in 0 1 2 3
- do
- # host bin dir
-diff -r -u rust-0.11.0.orig/mk/main.mk rust-0.11.0/mk/main.mk
---- rust-0.11.0.orig/mk/main.mk
-+++ rust-0.11.0/mk/main.mk
-@@ -304,7 +304,11 @@
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-+ifeq ($(1),0)
-+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
-+else
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
-+endif
-
- # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
-diff -r -u rust-0.11.0.orig/src/etc/install.sh rust-0.11.0/src/etc/install.sh
---- rust-0.11.0.orig/src/etc/install.sh
-+++ rust-0.11.0/src/etc/install.sh
-@@ -35,6 +35,13 @@
- fi
- }
-
-+need_cmd() {
-+ if command -v $1 >/dev/null 2>&1
-+ then msg "found $1"
-+ else err "need $1"
-+ fi
-+}
-+
- putvar() {
- local T
- eval T=\$$1
-@@ -198,7 +205,16 @@
- ABSOLUTIFIED="${FILE_PATH}"
- }
-
--CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
-+msg "looking for install programs"
-+need_cmd mkdir
-+need_cmd printf
-+need_cmd cut
-+need_cmd grep
-+need_cmd uname
-+need_cmd tr
-+need_cmd sed
-+
-+CFG_SRC_DIR="$(cd $(dirname $0) && pwd)"
- CFG_SELF="$0"
- CFG_ARGS="$@"
-
-@@ -216,16 +232,85 @@
- step_msg "processing $CFG_SELF args"
- fi
-
-+# Check for mingw or cygwin in order to special case $CFG_LIBDIR_RELATIVE.
-+# This logic is duplicated from configure in order to get the correct libdir
-+# for Windows installs.
-+CFG_OSTYPE=$(uname -s)
-+
-+case $CFG_OSTYPE in
-+
-+ MINGW32*)
-+ CFG_OSTYPE=pc-mingw32
-+ ;;
-+
-+ MINGW64*)
-+ # msys2, MSYSTEM=MINGW64
-+ CFG_OSTYPE=w64-mingw32
-+ ;;
-+
-+# Thad's Cygwin identifers below
-+
-+# Vista 32 bit
-+ CYGWIN_NT-6.0)
-+ CFG_OSTYPE=pc-mingw32
-+ ;;
-+
-+# Vista 64 bit
-+ CYGWIN_NT-6.0-WOW64)
-+ CFG_OSTYPE=w64-mingw32
-+ ;;
-+
-+# Win 7 32 bit
-+ CYGWIN_NT-6.1)
-+ CFG_OSTYPE=pc-mingw32
-+ ;;
-+
-+# Win 7 64 bit
-+ CYGWIN_NT-6.1-WOW64)
-+ CFG_OSTYPE=w64-mingw32
-+ ;;
-+esac
-+
- OPTIONS=""
- BOOL_OPTIONS=""
- VAL_OPTIONS=""
-
-+# On windows we just store the libraries in the bin directory because
-+# there's no rpath. This is where the build system itself puts libraries;
-+# --libdir is used to configure the installation directory.
-+# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
-+CFG_LIBDIR_RELATIVE=lib
-+if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
-+then
-+ CFG_LIBDIR_RELATIVE=bin
-+fi
-+
-+if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
-+then
-+ CFG_LD_PATH_VAR=PATH
-+ CFG_OLD_LD_PATH_VAR=$PATH
-+elif [ "$CFG_OSTYPE" = "Darwin" ]
-+then
-+ CFG_LD_PATH_VAR=DYLD_LIBRARY_PATH
-+ CFG_OLD_LD_PATH_VAR=$DYLD_LIBRARY_PATH
-+else
-+ CFG_LD_PATH_VAR=LD_LIBRARY_PATH
-+ CFG_OLD_LD_PATH_VAR=$LD_LIBRARY_PATH
-+fi
-+
- flag uninstall "only uninstall from the installation prefix"
- opt verify 1 "verify that the installed binaries run correctly"
- valopt prefix "/usr/local" "set installation prefix"
--# NB This isn't quite the same definition as in `configure`.
--# just using 'lib' instead of CFG_LIBDIR_RELATIVE
--valopt libdir "${CFG_PREFIX}/lib" "install libraries"
-+# NB This is exactly the same definition as in `configure`.
-+valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
-+case "$CFG_LIBDIR" in
-+ "$CFG_PREFIX"/*) CAT_INC=2;;
-+ "$CFG_PREFIX"*) CAT_INC=1;;
-+ *)
-+ err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
-
- if [ $HELP -eq 1 ]
-@@ -247,11 +332,13 @@
- if [ -z "${CFG_UNINSTALL}" ]
- then
- msg "verifying platform can run binaries"
-+ export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib":$CFG_OLD_LD_PATH_VAR
- "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
- if [ $? -ne 0 ]
- then
- err "can't execute rustc binary on this platform"
- fi
-+ export $CFG_LD_PATH_VAR=$CFG_OLD_LD_PATH_VAR
- fi
- fi
-
-@@ -348,9 +435,9 @@
- # Decide the destination of the file
- FILE_INSTALL_PATH="${CFG_PREFIX}/$p"
-
-- if echo "$p" | grep "^lib/" > /dev/null
-+ if echo "$p" | grep "^${CFG_LIBDIR_RELATIVE}/" > /dev/null
- then
-- pp=`echo $p | sed 's/^lib\///'`
-+ pp=`echo $p | sed "s%^${CFG_LIBDIR_RELATIVE}/%%"`
- FILE_INSTALL_PATH="${CFG_LIBDIR}/$pp"
- fi
-
-@@ -384,24 +471,36 @@
- need_ok "failed to update manifest"
-
- # The manifest lists all files to install
--done < "${CFG_SRC_DIR}/lib/rustlib/manifest.in"
-+done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
-
- # Sanity check: can we run the installed binaries?
-+#
-+# As with the verification above, make sure the right LD_LIBRARY_PATH-equivalent
-+# is in place. Try first without this variable, and if that fails try again with
-+# the variable. If the second time tries, print a hopefully helpful message to
-+# add something to the appropriate environment variable.
- if [ -z "${CFG_DISABLE_VERIFY}" ]
- then
- msg "verifying installed binaries are executable"
-- "${CFG_PREFIX}/bin/rustc" --version > /dev/null
-+ "${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null
- if [ $? -ne 0 ]
- then
-- ERR="can't execute installed rustc binary. "
-- ERR="${ERR}installation may be broken. "
-- ERR="${ERR}if this is expected then rerun install.sh with \`--disable-verify\` "
-- ERR="${ERR}or \`make install\` with \`--disable-verify-install\`"
-- err "${ERR}"
-+ export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib":$CFG_OLD_LD_PATH_VAR
-+ "${CFG_PREFIX}/bin/rustc" --version > /dev/null
-+ if [ $? -ne 0 ]
-+ then
-+ ERR="can't execute installed rustc binary. "
-+ ERR="${ERR}installation may be broken. "
-+ ERR="${ERR}if this is expected then rerun install.sh with \`--disable-verify\` "
-+ ERR="${ERR}or \`make install\` with \`--disable-verify-install\`"
-+ err "${ERR}"
-+ else
-+ echo
-+ echo " Note: please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
-+ fi
- fi
- fi
-
--
- echo
- echo " Rust is ready to roll."
- echo
-diff -r -u rust-0.11.0.orig/src/librustc/metadata/filesearch.rs rust-0.11.0/src/librustc/metadata/filesearch.rs
---- rust-0.11.0.orig/src/librustc/metadata/filesearch.rs
-+++ rust-0.11.0/src/librustc/metadata/filesearch.rs
-@@ -243,10 +243,14 @@
- // of the directory where librustc is located, rather than where the rustc
- // binary is.
-
-- if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
-- return primary_libdir_name();
-- } else {
-- return secondary_libdir_name();
-+ match option_env!("CFG_LIBDIR_RELATIVE") {
-+ None => if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
-+ return primary_libdir_name();
-+ } else {
-+ return secondary_libdir_name();
-+ },
-+
-+ Some(libdir) => return libdir.to_string()
- }
-
- #[cfg(target_word_size = "64")]
+++ /dev/null
---- src/libcore/ops.rs
-+++ src/libcore/ops.rs
-@@ -570,12 +570,6 @@
-
- macro_rules! shl_impl(
- ($($t:ty)*) => ($(
-- #[cfg(stage0)]
-- impl Shl<$t, $t> for $t {
-- #[inline]
-- fn shl(&self, other: &$t) -> $t { (*self) << (*other) }
-- }
-- #[cfg(not(stage0), not(test))]
- impl Shl<$t, $t> for $t {
- #[inline]
- fn shl(&self, other: &$t) -> $t {
-@@ -619,12 +613,6 @@
-
- macro_rules! shr_impl(
- ($($t:ty)*) => ($(
-- #[cfg(stage0, not(test))]
-- impl Shr<$t, $t> for $t {
-- #[inline]
-- fn shr(&self, other: &$t) -> $t { (*self) >> (*other) }
-- }
-- #[cfg(not(stage0), not(test))]
- impl Shr<$t, $t> for $t {
- #[inline]
- fn shr(&self, other: &$t) -> $t { (*self) >> (*other as uint) }
+++ /dev/null
-This patch adds proper support for --libdir configure option
-See https://github.com/rust-lang/rust/issues/11671 and
-https://github.com/rust-lang/rust/pull/16552
-
-diff --git a/configure b/configure
-index 636d502..fff67b6 100755
---- a/configure
-+++ b/configure
-@@ -459,6 +459,14 @@ fi
-
- valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
-
-+case "$CFG_LIBDIR" in
-+ "$CFG_PREFIX"/*) CAT_INC=2;;
-+ "$CFG_PREFIX"*) CAT_INC=1;;
-+ *)
-+ err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- if [ $HELP -eq 1 ]
- then
- echo
-@@ -855,6 +863,15 @@ for h in $CFG_HOST
- do
- for t in $CFG_TARGET
- do
-+ # host lib dir stage0
-+ make_dir $h/stage0/lib
-+
-+ # target bin dir stage0
-+ make_dir $h/stage0/lib/rustlib/$t/bin
-+
-+ # target lib dir stage0
-+ make_dir $h/stage0/lib/rustlib/$t/lib
-+
- for i in 0 1 2 3
- do
- # host bin dir
-diff --git a/mk/main.mk b/mk/main.mk
-index 2bdfc1b..bca5b3b 100644
---- a/mk/main.mk
-+++ b/mk/main.mk
-@@ -311,7 +311,11 @@ define SREQ
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-+ifeq ($(1),0)
-+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
-+else
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
-+endif
-
- # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
-diff --git a/src/etc/install.sh b/src/etc/install.sh
-index c949743..1a472c6 100644
---- a/src/etc/install.sh
-+++ b/src/etc/install.sh
-@@ -301,9 +301,16 @@ fi
- flag uninstall "only uninstall from the installation prefix"
- opt verify 1 "verify that the installed binaries run correctly"
- valopt prefix "/usr/local" "set installation prefix"
--# NB This isn't quite the same definition as in `configure`.
--# just using 'lib' instead of CFG_LIBDIR_RELATIVE
-+# NB This is exactly the same definition as in `configure`.
- valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
-+case "$CFG_LIBDIR" in
-+ "$CFG_PREFIX"/*) CAT_INC=2;;
-+ "$CFG_PREFIX"*) CAT_INC=1;;
-+ *)
-+ err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
-+esac
-+CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+
- valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
-
- if [ $HELP -eq 1 ]
-@@ -428,9 +435,9 @@ while read p; do
- # Decide the destination of the file
- FILE_INSTALL_PATH="${CFG_PREFIX}/$p"
-
-- if echo "$p" | grep "^lib/" > /dev/null
-+ if echo "$p" | grep "^${CFG_LIBDIR_RELATIVE}/" > /dev/null
- then
-- pp=`echo $p | sed 's/^lib\///'`
-+ pp=`echo $p | sed "s%^${CFG_LIBDIR_RELATIVE}/%%"`
- FILE_INSTALL_PATH="${CFG_LIBDIR}/$pp"
- fi
-
-diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
-index 99b98b6..f3e37ff 100644
---- a/src/librustc/metadata/filesearch.rs
-+++ b/src/librustc/metadata/filesearch.rs
-@@ -243,10 +243,14 @@ fn find_libdir(sysroot: &Path) -> String {
- // of the directory where librustc is located, rather than where the rustc
- // binary is.
-
-- if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
-- return primary_libdir_name();
-- } else {
-- return secondary_libdir_name();
-+ match option_env!("CFG_LIBDIR_RELATIVE") {
-+ None => if sysroot.join(primary_libdir_name()).join(rustlibdir()).exists() {
-+ return primary_libdir_name();
-+ } else {
-+ return secondary_libdir_name();
-+ },
-+
-+ Some(libdir) => return libdir.to_string()
- }
-
- #[cfg(target_word_size = "64")]
+++ /dev/null
-diff -u -r rust-0.12.0.orig/src/libcollections/string.rs rust-0.12.0/src/libcollections/string.rs
---- rust-0.12.0.orig/src/libcollections/string.rs 2014-10-11 14:54:06.303867073 +0200
-+++ rust-0.12.0/src/libcollections/string.rs 2014-10-11 14:54:44.063471071 +0200
-@@ -928,29 +928,6 @@
- }
- }
-
--#[cfg(stage0)]
--impl ops::Slice<uint, str> for String {
-- #[inline]
-- fn as_slice_<'a>(&'a self) -> &'a str {
-- self.as_slice()
-- }
--
-- #[inline]
-- fn slice_from_<'a>(&'a self, from: &uint) -> &'a str {
-- self[][*from..]
-- }
--
-- #[inline]
-- fn slice_to_<'a>(&'a self, to: &uint) -> &'a str {
-- self[][..*to]
-- }
--
-- #[inline]
-- fn slice_<'a>(&'a self, from: &uint, to: &uint) -> &'a str {
-- self[][*from..*to]
-- }
--}
--#[cfg(not(stage0))]
- impl ops::Slice<uint, str> for String {
- #[inline]
- fn as_slice_<'a>(&'a self) -> &'a str {
-diff -u -r rust-0.12.0.orig/src/libcollections/trie.rs rust-0.12.0/src/libcollections/trie.rs
---- rust-0.12.0.orig/src/libcollections/trie.rs 2014-10-11 14:54:06.303867073 +0200
-+++ rust-0.12.0/src/libcollections/trie.rs 2014-10-11 14:55:10.623192469 +0200
-@@ -389,15 +389,6 @@
-
- impl<T> TrieMap<T> {
- // If `upper` is true then returns upper_bound else returns lower_bound.
-- #[cfg(stage0)]
-- #[inline]
-- fn bound<'a>(&'a self, key: uint, upper: bool) -> Entries<'a, T> {
-- bound!(Entries, self = self,
-- key = key, is_upper = upper,
-- slice_from = slice_from_, iter = iter,
-- mutability = )
-- }
-- #[cfg(not(stage0))]
- #[inline]
- fn bound<'a>(&'a self, key: uint, upper: bool) -> Entries<'a, T> {
- bound!(Entries, self = self,
-@@ -440,15 +431,6 @@
- self.bound(key, true)
- }
- // If `upper` is true then returns upper_bound else returns lower_bound.
-- #[cfg(stage0)]
-- #[inline]
-- fn bound_mut<'a>(&'a mut self, key: uint, upper: bool) -> MutEntries<'a, T> {
-- bound!(MutEntries, self = self,
-- key = key, is_upper = upper,
-- slice_from = slice_from_mut_, iter = iter_mut,
-- mutability = mut)
-- }
-- #[cfg(not(stage0))]
- #[inline]
- fn bound_mut<'a>(&'a mut self, key: uint, upper: bool) -> MutEntries<'a, T> {
- bound!(MutEntries, self = self,
-diff -u -r rust-0.12.0.orig/src/libcollections/vec.rs rust-0.12.0/src/libcollections/vec.rs
---- rust-0.12.0.orig/src/libcollections/vec.rs 2014-10-11 14:54:06.303867073 +0200
-+++ rust-0.12.0/src/libcollections/vec.rs 2014-10-11 14:55:35.422932321 +0200
-@@ -460,28 +460,6 @@
- }
- }*/
-
--#[cfg(stage0)]
--impl<T> ops::Slice<uint, [T]> for Vec<T> {
-- #[inline]
-- fn as_slice_<'a>(&'a self) -> &'a [T] {
-- self.as_slice()
-- }
--
-- #[inline]
-- fn slice_from_<'a>(&'a self, start: &uint) -> &'a [T] {
-- self.as_slice().slice_from_(start)
-- }
--
-- #[inline]
-- fn slice_to_<'a>(&'a self, end: &uint) -> &'a [T] {
-- self.as_slice().slice_to_(end)
-- }
-- #[inline]
-- fn slice_<'a>(&'a self, start: &uint, end: &uint) -> &'a [T] {
-- self.as_slice().slice_(start, end)
-- }
--}
--#[cfg(not(stage0))]
- impl<T> ops::Slice<uint, [T]> for Vec<T> {
- #[inline]
- fn as_slice_<'a>(&'a self) -> &'a [T] {
-@@ -503,28 +481,6 @@
- }
- }
-
--#[cfg(stage0)]
--impl<T> ops::SliceMut<uint, [T]> for Vec<T> {
-- #[inline]
-- fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
-- self.as_mut_slice()
-- }
--
-- #[inline]
-- fn slice_from_mut_<'a>(&'a mut self, start: &uint) -> &'a mut [T] {
-- self.as_mut_slice().slice_from_mut_(start)
-- }
--
-- #[inline]
-- fn slice_to_mut_<'a>(&'a mut self, end: &uint) -> &'a mut [T] {
-- self.as_mut_slice().slice_to_mut_(end)
-- }
-- #[inline]
-- fn slice_mut_<'a>(&'a mut self, start: &uint, end: &uint) -> &'a mut [T] {
-- self.as_mut_slice().slice_mut_(start, end)
-- }
--}
--#[cfg(not(stage0))]
- impl<T> ops::SliceMut<uint, [T]> for Vec<T> {
- #[inline]
- fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
-diff -u -r rust-0.12.0.orig/src/libcore/intrinsics.rs rust-0.12.0/src/libcore/intrinsics.rs
---- rust-0.12.0.orig/src/libcore/intrinsics.rs 2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/intrinsics.rs 2014-10-11 14:57:53.081488143 +0200
-@@ -254,7 +254,6 @@
- /// enabling further optimizations.
- ///
- /// NB: This is very different from the `unreachable!()` macro!
-- #[cfg(not(stage0))]
- pub fn unreachable() -> !;
-
- /// Execute a breakpoint trap, for inspection by a debugger.
-diff -u -r rust-0.12.0.orig/src/libcore/ops.rs rust-0.12.0/src/libcore/ops.rs
---- rust-0.12.0.orig/src/libcore/ops.rs 2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/ops.rs 2014-10-11 14:56:38.552270110 +0200
-@@ -711,7 +711,6 @@
- * }
- * ```
- */
--#[cfg(not(stage0))]
- #[lang="slice"]
- pub trait Slice<Idx, Sized? Result> for Sized? {
- /// The method for the slicing operation foo[]
-@@ -723,21 +722,6 @@
- /// The method for the slicing operation foo[from..to]
- fn slice_or_fail<'a>(&'a self, from: &Idx, to: &Idx) -> &'a Result;
- }
--#[cfg(stage0)]
--/**
-- *
-- */
--#[lang="slice"]
--pub trait Slice<Idx, Sized? Result> for Sized? {
-- /// The method for the slicing operation foo[]
-- fn as_slice_<'a>(&'a self) -> &'a Result;
-- /// The method for the slicing operation foo[from..]
-- fn slice_from_<'a>(&'a self, from: &Idx) -> &'a Result;
-- /// The method for the slicing operation foo[..to]
-- fn slice_to_<'a>(&'a self, to: &Idx) -> &'a Result;
-- /// The method for the slicing operation foo[from..to]
-- fn slice_<'a>(&'a self, from: &Idx, to: &Idx) -> &'a Result;
--}
-
- /**
- *
-@@ -776,7 +760,7 @@
- * }
- * ```
- */
--#[cfg(not(stage0))]
-+
- #[lang="slice_mut"]
- pub trait SliceMut<Idx, Sized? Result> for Sized? {
- /// The method for the slicing operation foo[]
-@@ -788,21 +772,7 @@
- /// The method for the slicing operation foo[from..to]
- fn slice_or_fail_mut<'a>(&'a mut self, from: &Idx, to: &Idx) -> &'a mut Result;
- }
--#[cfg(stage0)]
--/**
-- *
-- */
--#[lang="slice_mut"]
--pub trait SliceMut<Idx, Sized? Result> for Sized? {
-- /// The method for the slicing operation foo[mut]
-- fn as_mut_slice_<'a>(&'a mut self) -> &'a mut Result;
-- /// The method for the slicing operation foo[mut from..]
-- fn slice_from_mut_<'a>(&'a mut self, from: &Idx) -> &'a mut Result;
-- /// The method for the slicing operation foo[mut ..to]
-- fn slice_to_mut_<'a>(&'a mut self, to: &Idx) -> &'a mut Result;
-- /// The method for the slicing operation foo[mut from..to]
-- fn slice_mut_<'a>(&'a mut self, from: &Idx, to: &Idx) -> &'a mut Result;
--}
-+
- /**
- *
- * The `Deref` trait is used to specify the functionality of dereferencing
-diff -u -r rust-0.12.0.orig/src/libcore/slice.rs rust-0.12.0/src/libcore/slice.rs
---- rust-0.12.0.orig/src/libcore/slice.rs 2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/slice.rs 2014-10-11 14:57:08.101960051 +0200
-@@ -488,7 +488,6 @@
-
-
-
--#[cfg(not(stage0))]
- impl<T> ops::Slice<uint, [T]> for [T] {
- #[inline]
- fn as_slice_<'a>(&'a self) -> &'a [T] {
-@@ -516,36 +515,7 @@
- }
- }
- }
--#[cfg(stage0)]
--impl<T> ops::Slice<uint, [T]> for [T] {
-- #[inline]
-- fn as_slice_<'a>(&'a self) -> &'a [T] {
-- self
-- }
--
-- #[inline]
-- fn slice_from_<'a>(&'a self, start: &uint) -> &'a [T] {
-- self.slice_(start, &self.len())
-- }
-
-- #[inline]
-- fn slice_to_<'a>(&'a self, end: &uint) -> &'a [T] {
-- self.slice_(&0, end)
-- }
-- #[inline]
-- fn slice_<'a>(&'a self, start: &uint, end: &uint) -> &'a [T] {
-- assert!(*start <= *end);
-- assert!(*end <= self.len());
-- unsafe {
-- transmute(RawSlice {
-- data: self.as_ptr().offset(*start as int),
-- len: (*end - *start)
-- })
-- }
-- }
--}
--
--#[cfg(not(stage0))]
- impl<T> ops::SliceMut<uint, [T]> for [T] {
- #[inline]
- fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
-@@ -567,35 +537,6 @@
- assert!(*start <= *end);
- assert!(*end <= self.len());
- unsafe {
-- transmute(RawSlice {
-- data: self.as_ptr().offset(*start as int),
-- len: (*end - *start)
-- })
-- }
-- }
--}
--#[cfg(stage0)]
--impl<T> ops::SliceMut<uint, [T]> for [T] {
-- #[inline]
-- fn as_mut_slice_<'a>(&'a mut self) -> &'a mut [T] {
-- self
-- }
--
-- #[inline]
-- fn slice_from_mut_<'a>(&'a mut self, start: &uint) -> &'a mut [T] {
-- let len = &self.len();
-- self.slice_mut_(start, len)
-- }
--
-- #[inline]
-- fn slice_to_mut_<'a>(&'a mut self, end: &uint) -> &'a mut [T] {
-- self.slice_mut_(&0, end)
-- }
-- #[inline]
-- fn slice_mut_<'a>(&'a mut self, start: &uint, end: &uint) -> &'a mut [T] {
-- assert!(*start <= *end);
-- assert!(*end <= self.len());
-- unsafe {
- transmute(RawSlice {
- data: self.as_ptr().offset(*start as int),
- len: (*end - *start)
-diff -u -r rust-0.12.0.orig/src/libcore/str.rs rust-0.12.0/src/libcore/str.rs
---- rust-0.12.0.orig/src/libcore/str.rs 2014-10-11 14:54:06.313867033 +0200
-+++ rust-0.12.0/src/libcore/str.rs 2014-10-11 14:55:53.262745176 +0200
-@@ -1164,29 +1164,6 @@
- fn equiv(&self, other: &S) -> bool { eq_slice(*self, other.as_slice()) }
- }
-
-- #[cfg(stage0)]
-- impl ops::Slice<uint, str> for str {
-- #[inline]
-- fn as_slice_<'a>(&'a self) -> &'a str {
-- self
-- }
--
-- #[inline]
-- fn slice_from_<'a>(&'a self, from: &uint) -> &'a str {
-- self.slice_from(*from)
-- }
--
-- #[inline]
-- fn slice_to_<'a>(&'a self, to: &uint) -> &'a str {
-- self.slice_to(*to)
-- }
--
-- #[inline]
-- fn slice_<'a>(&'a self, from: &uint, to: &uint) -> &'a str {
-- self.slice(*from, *to)
-- }
-- }
-- #[cfg(not(stage0))]
- impl ops::Slice<uint, str> for str {
- #[inline]
- fn as_slice_<'a>(&'a self) -> &'a str {
Remove ldconfig(1) execution to prevent the installation script from accessing
outside of a sandbox.
-diff --git a/src/etc/install.sh b/src/etc/install.sh
-index c949743..7c3daa5 100644
---- a/src/etc/install.sh
-+++ b/src/etc/install.sh
-@@ -466,17 +466,6 @@ while read p; do
- # The manifest lists all files to install
- done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
-
+diff --git a/install-template.sh b/install-template.sh
+index 11bf392..bc579f5 100644
+--- a/src/rust-installer/install-template.sh
++++ b/src/rust-installer/install-template.sh
+@@ -697,17 +697,6 @@ done
+ # Drop the version number into the manifest dir
+ echo "$TEMPLATE_RUST_INSTALLER_VERSION" > "${ABS_LIBDIR}/${TEMPLATE_REL_MANIFEST_DIR}/rust-installer-version"
+
-# Run ldconfig to make dynamic libraries available to the linker
--if [ "$CFG_OSTYPE" = "Linux" ]
-- then
+-if [ "$CFG_OSTYPE" = "unknown-linux-gnu" -a ! -n "$CFG_DISABLE_LDCONFIG" ]; then
+- msg "running ldconfig"
- ldconfig
- if [ $? -ne 0 ]
- then
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-0.11.0-r2.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-ARCH_SRC_URI="amd64? ( http://static.rust-lang.org/dist/${P}-x86_64-unknown-linux-gnu.tar.gz )
- x86? ( http://static.rust-lang.org/dist/${P}-i686-unknown-linux-gnu.tar.gz )"
-
-SRC_URI="http://static.rust-lang.org/dist/${P}.tar.gz ${ARCH_SRC_URI}"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="0.11"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
- >=app-admin/eselect-rust-0.2_pre20141011
- !dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.0
- clang? ( sys-devel/clang )
-"
-RDEPEND="${CDEPEND}
- emacs? ( >=app-emacs/rust-mode-${PV} )
- vim-syntax? ( >=app-vim/rust-mode-${PV} )
- zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-stage0.patch" "${FILESDIR}/${P}-libdir.patch"
-}
-
-src_configure() {
- use amd64 && ARCH_POSTFIX="x86_64"
- use x86 && ARCH_POSTFIX="i686"
- LOCAL_RUST_PATH="${WORKDIR}/${P}-${ARCH_POSTFIX}-unknown-linux-gnu"
-
- "${ECONF_SOURCE:-.}"/configure \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/lib/${P}" \
- --mandir="${EPREFIX}/usr/share/${P}/man" \
- $(use_enable clang) \
- $(use_enable debug) \
- $(use_enable debug llvm-assertions) \
- $(use_enable !debug optimize) \
- $(use_enable !debug optimize-cxx) \
- $(use_enable !debug optimize-llvm) \
- $(use_enable !debug optimize-tests) \
- $(use_enable libcxx libcpp) \
- --enable-local-rust \
- --local-rust-root="${LOCAL_RUST_PATH}" \
- --disable-manage-submodules \
- --disable-verify-install \
- || die
-}
-
-src_compile() {
- emake VERBOSE=1
-}
-
-src_install() {
- default
-
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-
- cat <<-EOF > "${T}"/50${P}
- LDPATH="/usr/lib/${P}"
- MANPATH="/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- dodir /etc/env.d/rust
- touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust uses slots now, use 'eselect rust list'"
- elog "and 'eselect rust set' to list and set rust version."
- elog "For more information see 'eselect rust help'"
- elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-0.12.0.ebuild,v 1.1 2014/10/18 12:48:43 jauhien Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-ARCH_SRC_URI="amd64? ( http://static.rust-lang.org/dist/${P}-x86_64-unknown-linux-gnu.tar.gz )
- x86? ( http://static.rust-lang.org/dist/${P}-i686-unknown-linux-gnu.tar.gz )"
-
-SRC_URI="http://static.rust-lang.org/dist/${P}.tar.gz ${ARCH_SRC_URI}"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="0.12"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="clang debug emacs libcxx vim-syntax zsh-completion"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
- >=app-admin/eselect-rust-0.2_pre20141011
- !dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.0
- clang? ( sys-devel/clang )
-"
-RDEPEND="${CDEPEND}
- emacs? ( >=app-emacs/rust-mode-${PV} )
- vim-syntax? ( >=app-vim/rust-mode-${PV} )
- zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-stage0.patch" "${FILESDIR}/${P}-no-ldconfig.patch" "${FILESDIR}/${P}-libdir.patch"
-
- local postfix="gentoo-${SLOT}"
- sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
-}
-
-src_configure() {
- use amd64 && ARCH_POSTFIX="x86_64"
- use x86 && ARCH_POSTFIX="i686"
- LOCAL_RUST_PATH="${WORKDIR}/${P}-${ARCH_POSTFIX}-unknown-linux-gnu"
-
- "${ECONF_SOURCE:-.}"/configure \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/lib/${P}" \
- --mandir="${EPREFIX}/usr/share/${P}/man" \
- $(use_enable clang) \
- $(use_enable debug) \
- $(use_enable debug llvm-assertions) \
- $(use_enable !debug optimize) \
- $(use_enable !debug optimize-cxx) \
- $(use_enable !debug optimize-llvm) \
- $(use_enable !debug optimize-tests) \
- $(use_enable libcxx libcpp) \
- --enable-local-rust \
- --local-rust-root="${LOCAL_RUST_PATH}" \
- --disable-manage-submodules \
- --disable-verify-install \
- --disable-docs \
- || die
-}
-
-src_compile() {
- emake VERBOSE=1
-}
-
-src_install() {
- default
-
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-
- cat <<-EOF > "${T}"/50${P}
- LDPATH="/usr/lib/${P}"
- MANPATH="/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- dodir /etc/env.d/rust
- touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust uses slots now, use 'eselect rust list'"
- elog "and 'eselect rust set' to list and set rust version."
- elog "For more information see 'eselect rust help'"
- elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-999-r1.ebuild,v 1.4 2014/11/30 12:45:15 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0_alpha.ebuild,v 1.1 2015/02/10 11:35:29 jauhien Exp $
EAPI="5"
inherit eutils python-any-r1
-MY_P=${PN}-nightly
-
+MY_PV="rustc-1.0.0-alpha"
DESCRIPTION="Systems programming language from Mozilla"
HOMEPAGE="http://www.rust-lang.org/"
-MY_SRC_URI="http://static.rust-lang.org/dist/${MY_P}.tar.gz"
+
+SRC_URI="http://static.rust-lang.org/dist/${MY_PV}-src.tar.gz
+ x86? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-01-07-9e4e524-linux-i386-d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4.tar.bz2 )
+ amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-01-07-9e4e524-linux-x86_64-697880d3640e981bbbf23284363e8e9a158b588d.tar.bz2 )"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="nightly"
-KEYWORDS=""
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
-IUSE="clang debug emacs libcxx +system-llvm vim-syntax zsh-completion"
+IUSE="clang debug libcxx +system-llvm"
REQUIRED_USE="libcxx? ( clang )"
CDEPEND="libcxx? ( sys-libs/libcxx )
DEPEND="${CDEPEND}
${PYTHON_DEPS}
>=dev-lang/perl-5.0
- net-misc/wget
clang? ( sys-devel/clang )
- system-llvm? ( >=sys-devel/llvm-3.5.0[multitarget(-)] )
+ system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
"
RDEPEND="${CDEPEND}
- emacs? ( >=app-emacs/rust-mode-${PV} )
- vim-syntax? ( >=app-vim/rust-mode-${PV} )
- zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_PV}
src_unpack() {
- wget "${MY_SRC_URI}" || die
- unpack ./"${PN}-nightly.tar.gz"
-
- use amd64 && BUILD_TRIPLE=x86_64-unknown-linux-gnu
- use x86 && BUILD_TRIPLE=i686-unknown-linux-gnu
- export CFG_SRC_DIR="${S}" && \
- cd ${S} && \
- mkdir -p "${S}/dl" && \
- mkdir -p "${S}/${BUILD_TRIPLE}/stage0/bin" && \
- python2 "${S}/src/etc/get-snapshot.py" ${BUILD_TRIPLE} || die
+ unpack "${MY_PV}-src.tar.gz" || die
+ mkdir "${MY_PV}/dl" || die
+ cp "${DISTDIR}/rust-stage0"* "${MY_PV}/dl/" || die
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
+ epatch "${FILESDIR}/${PN}-0.13.0-no-ldconfig.patch"
local postfix="gentoo-${SLOT}"
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
}
src_configure() {
+ use amd64 && ARCH_POSTFIX="x86_64"
+ use x86 && ARCH_POSTFIX="i686"
+ LOCAL_RUST_PATH="${WORKDIR}/rust-1.0.0-alpha-${ARCH_POSTFIX}-unknown-linux-gnu/bin"
+
local system_llvm
use system-llvm && system_llvm="--llvm-root=${EPREFIX}/usr"
mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
- mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+ mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+
+ dodoc COPYRIGHT LICENSE-APACHE LICENSE-MIT
+
+ rm "${D}/usr/share/doc/rust" -rf
+
+ # le kludge that fixes https://github.com/Heather/gentoo-rust/issues/41
+ mv "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"/* "${D}/usr/lib/rust-${PV}/rustlib/"
+ rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"
+ mv "${D}/usr/lib/rust-${PV}/rust-${PV}/"/* "${D}/usr/lib/rust-${PV}/"
+ rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/"
cat <<-EOF > "${T}"/50${P}
LDPATH="/usr/lib/${P}"
elog "For more information see 'eselect rust help'"
elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
- elog "Rust installs a helper script for calling LLDB now,"
- elog "for your convenience it is installed under /usr/bin/rust-lldb-${PV},"
- elog "but note, that there is no LLDB ebuild in the tree currently,"
- elog "so you are on your own if you want to use it."
+ elog "Rust installs a helper script for calling GDB now,"
+ elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
+
+ if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+ elog "install app-emacs/rust-mode to get emacs support for rust."
+ fi
+
+ if has_version app-editors/gvim || has_version app-editors/vim; then
+ elog "install app-vim/rust-mode to get vim support for rust."
+ fi
+
+ if has_version 'app-shells/zsh'; then
+ elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+ fi
}
pkg_postrm() {
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-9999-r3.ebuild,v 1.3 2014/11/30 12:45:15 jauhien Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils git-r3 python-any-r1
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-EGIT_REPO_URI="git://github.com/rust-lang/rust.git"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="git"
-KEYWORDS=""
-
-IUSE="clang debug emacs libcxx +system-llvm vim-syntax zsh-completion"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
- >=app-admin/eselect-rust-0.2_pre20141128
- !dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.0
- clang? ( sys-devel/clang )
- system-llvm? ( >=sys-devel/llvm-3.5.0[multitarget(-)] )
-"
-RDEPEND="${CDEPEND}
- emacs? ( >=app-emacs/rust-mode-${PV} )
- vim-syntax? ( >=app-vim/rust-mode-${PV} )
- zsh-completion? ( >=app-shells/rust-zshcomp-${PV} )
-"
-
-src_unpack() {
- git-r3_src_unpack
-
- use amd64 && BUILD_TRIPLE=x86_64-unknown-linux-gnu
- use x86 && BUILD_TRIPLE=i686-unknown-linux-gnu
- export CFG_SRC_DIR="${S}" && \
- cd ${S} && \
- mkdir -p "${S}/dl" && \
- mkdir -p "${S}/${BUILD_TRIPLE}/stage0/bin" && \
- python2 "${S}/src/etc/get-snapshot.py" ${BUILD_TRIPLE} || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.12.0-no-ldconfig.patch"
-
- local postfix="gentoo-${SLOT}"
- sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
-}
-
-src_configure() {
- local system_llvm
- use system-llvm && system_llvm="--llvm-root=${EPREFIX}/usr"
-
- "${ECONF_SOURCE:-.}"/configure \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/lib/${P}" \
- --mandir="${EPREFIX}/usr/share/${P}/man" \
- $(use_enable clang) \
- $(use_enable debug) \
- $(use_enable debug llvm-assertions) \
- $(use_enable !debug optimize) \
- $(use_enable !debug optimize-cxx) \
- $(use_enable !debug optimize-llvm) \
- $(use_enable !debug optimize-tests) \
- $(use_enable libcxx libcpp) \
- ${system_llvm} \
- --disable-manage-submodules \
- --disable-verify-install \
- --disable-docs \
- || die
-}
-
-src_compile() {
- emake VERBOSE=1
-}
-
-src_install() {
- default
-
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
- mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
- cat <<-EOF > "${T}"/50${P}
- LDPATH="/usr/lib/${P}"
- MANPATH="/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- dodir /etc/env.d/rust
- touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust uses slots now, use 'eselect rust list'"
- elog "and 'eselect rust set' to list and set rust version."
- elog "For more information see 'eselect rust help'"
- elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-
- elog "Rust installs a helper script for calling LLDB now,"
- elog "for your convenience it is installed under /usr/bin/rust-lldb-${PV},"
- elog "but note, that there is no LLDB ebuild in the tree currently,"
- elog "so you are on your own if you want to use it."
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}
projects / gentoo.git / commitdiff