Skip to content

Commit ee08587

Browse files
committed
[dev-lang/rust] version bump
LLVM in Gentoo is shipped as static libs only now, until Rust upstream fixies linking using system wide LLVM is impossible see rust-lang/rust#27937 -Werror during Rust building was disabled
1 parent 105e471 commit ee08587

File tree

5 files changed

+142
-9
lines changed

5 files changed

+142
-9
lines changed

dev-lang/rust/Manifest

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
DIST rust-stage0-2015-05-24-ba0e1cd-linux-i386-a6f22e481eabf098cc65bda97bf7e434a1fcc20b.tar.bz2 15633335 SHA256 f6787490b97923386b3469d698b700be1ab7f8d43efa427031e228a59f893993 SHA512 8b7c706d02b8198343d67b30921ba22879bc44943284b8fcf24d8de1861b64cd5441cf5b1e2551021fa8777c78073e9b492a2e79da2889368f5c47392315dbc9 WHIRLPOOL 6766d6c536eace21c9f412eb628b759338df41985eab38a9e0c47271d0b11b500c09ac8c0797384b43223419df6e21af0747bfd781a4e3052b3d6d3047ced2e6
22
DIST rust-stage0-2015-05-24-ba0e1cd-linux-x86_64-5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c.tar.bz2 14913394 SHA256 11f7f56320bd0dff5b47bae3f80377d9514a3ad4bc983d674eb33074c95d66a0 SHA512 795d53c802480b5f54d80032e9d0aee56fa26a5bb1a5f79c6673d7646c30e0dccfa7926b1fdd4c5874d9d7b7dd245143686a52e228b17c4c96dec371daf1b625 WHIRLPOOL e098dc9a6348dc0da211b1d23ccb2b0a10e0a8b8e4babf1e710d6007e7580b8656f5788343bbafdc22dca20df247a332fac19476ffff244fc4607c1a1e7b4db5
3+
DIST rust-stage0-2015-07-26-a5c12f4-linux-i386-3459275cdf3896f678e225843fa56f0d9fdbabe8.tar.bz2 16414576 SHA256 be9581981f0daf8b573d694269e60219f09ef6ea10901b422d87dc580484199a SHA512 c0a3b8cbc710a08edacbdedc6f635a8d6665304c9c8272430f4d6c5847fda2cef852e1f84f74603a4306169ceaf176b3fc77d1bc49c3bbd9dade87cfb64df30d WHIRLPOOL 69f59db907df480846d0a4faed4c751033c20d78b3ad59de018261e4732c45aea305af1ccbfdabd632c0029cf23c66bd690ef07a54602345736dc81ce9d2d1b5
4+
DIST rust-stage0-2015-07-26-a5c12f4-linux-x86_64-e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c.tar.bz2 15900837 SHA256 779943595dd63d6869c747e2a31c13095f9c5354d4530327d6f9310cc580c2ff SHA512 c6d74065f785719bb7e394e42bc64d323d00c0c3e70a4e16961055b8fbe69e557c7dc4875b3ba3d8c04184220aa35da7311d880b5f987b7105f54fdfcc20ded4 WHIRLPOOL f0c5ba9f40cc857dc5406704a3d8dfd468150d6ff0494a206d43a2e0e12c6670a23079b932f59233c64cce6af75f1e677c308e3434f9e416ac5e21951129afcb
35
DIST rustc-1.2.0-src.tar.gz 23863924 SHA256 ea6eb983daf2a073df57186a58f0d4ce0e85c711bec13c627a8c85d51b6a6d78 SHA512 2596c0dddff0276916edbb7d68ae610209c75d53d89f1f15dc56ad7408e235dbedfcd1bba9c446dd1e32a8d274cedebb7b32b328223280c28ab546bbd06f1c76 WHIRLPOOL 741118f7e265129bfd0f0d66487e12dc8f95018d8479e8f3cde555160abdb29ade9c69607a2daa088ae3dbe74c1120c16141248cd771a6e56759ce10cfc45a62
6+
DIST rustc-1.3.0-src.tar.gz 24308223 SHA256 ea02d7bc9e7de5b8be3fe6b37ea9b2bd823f9a532c8e4c47d02f37f24ffa3126 SHA512 d9a4851d958e6a62f0997af5451c1c1ba2bd3ace595cf9f1dbc5977a6efb0ba802d108d4aa6fc29540c41b36d7f5a04e518700b5c1426fe18d1627d5fa779d58 WHIRLPOOL 21d9216bfa31b71e04ad35b4d72fd2b7b466b89cf62be2f9b0d734af21d1cba2050171bf3b9757c14a675fae11b869fcda30abc528e07ddcdc9d1a2bf0e3b7dc

dev-lang/rust/rust-1.3.0.ebuild

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# Copyright 1999-2015 Gentoo Foundation
2+
# Distributed under the terms of the GNU General Public License v2
3+
# $Id$
4+
5+
EAPI=5
6+
7+
PYTHON_COMPAT=( python2_7 )
8+
9+
inherit eutils multilib python-any-r1
10+
11+
MY_P="rustc-${PV}"
12+
13+
DESCRIPTION="Systems programming language from Mozilla"
14+
HOMEPAGE="http://www.rust-lang.org/"
15+
16+
SRC_URI="http://static.rust-lang.org/dist/${MY_P}-src.tar.gz
17+
amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-07-26-a5c12f4-linux-x86_64-e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c.tar.bz2 )
18+
x86? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-07-26-a5c12f4-linux-i386-3459275cdf3896f678e225843fa56f0d9fdbabe8.tar.bz2 )
19+
"
20+
21+
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
22+
SLOT="stable"
23+
KEYWORDS="~amd64 ~x86"
24+
25+
IUSE="clang debug doc libcxx"
26+
REQUIRED_USE="libcxx? ( clang )"
27+
28+
CDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
29+
libcxx? ( sys-libs/libcxx )
30+
"
31+
DEPEND="${CDEPEND}
32+
${PYTHON_DEPS}
33+
>=dev-lang/perl-5.0
34+
clang? ( sys-devel/clang )
35+
"
36+
RDEPEND="${CDEPEND}"
37+
38+
S=${WORKDIR}/${MY_P}
39+
40+
src_unpack() {
41+
unpack "${MY_P}-src.tar.gz" || die
42+
mkdir "${MY_P}/dl" || die
43+
cp "${DISTDIR}/rust-stage0"* "${MY_P}/dl/" || die
44+
}
45+
46+
src_prepare() {
47+
local postfix="gentoo-${SLOT}"
48+
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
49+
find mk -name '*.mk' -exec \
50+
sed -i -e "s/-Werror / /g" {} \; || die
51+
epatch "${FILESDIR}/${PN}-1.1.0-install.patch"
52+
}
53+
54+
src_configure() {
55+
export CFG_DISABLE_LDCONFIG="notempty"
56+
57+
"${ECONF_SOURCE:-.}"/configure \
58+
--prefix="${EPREFIX}/usr" \
59+
--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
60+
--mandir="${EPREFIX}/usr/share/${P}/man" \
61+
--release-channel=${SLOT} \
62+
--disable-manage-submodules \
63+
$(use_enable clang) \
64+
$(use_enable debug) \
65+
$(use_enable debug llvm-assertions) \
66+
$(use_enable !debug optimize) \
67+
$(use_enable !debug optimize-cxx) \
68+
$(use_enable !debug optimize-llvm) \
69+
$(use_enable !debug optimize-tests) \
70+
$(use_enable doc docs) \
71+
$(use_enable libcxx libcpp) \
72+
|| die
73+
}
74+
75+
src_compile() {
76+
emake VERBOSE=1
77+
}
78+
79+
src_install() {
80+
unset SUDO_USER
81+
82+
default
83+
84+
mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
85+
mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
86+
mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
87+
88+
dodoc COPYRIGHT LICENSE-APACHE LICENSE-MIT
89+
90+
dodir "/usr/share/doc/rust-${PV}/"
91+
mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
92+
rmdir "${D}/usr/share/doc/rust/" || die
93+
94+
cat <<-EOF > "${T}"/50${P}
95+
LDPATH="/usr/$(get_libdir)/${P}"
96+
MANPATH="/usr/share/${P}/man"
97+
EOF
98+
doenvd "${T}"/50${P}
99+
100+
cat <<-EOF > "${T}/provider-${P}"
101+
/usr/bin/rustdoc
102+
/usr/bin/rust-gdb
103+
EOF
104+
dodir /etc/env.d/rust
105+
insinto /etc/env.d/rust
106+
doins "${T}/provider-${P}"
107+
}
108+
109+
pkg_postinst() {
110+
eselect rust update --if-unset
111+
112+
elog "Rust installs a helper script for calling GDB now,"
113+
elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
114+
115+
if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
116+
elog "install app-emacs/rust-mode to get emacs support for rust."
117+
fi
118+
119+
if has_version app-editors/gvim || has_version app-editors/vim; then
120+
elog "install app-vim/rust-mode to get vim support for rust."
121+
fi
122+
123+
if has_version 'app-shells/zsh'; then
124+
elog "install app-shells/rust-zshcomp to get zsh completion for rust."
125+
fi
126+
}
127+
128+
pkg_postrm() {
129+
eselect rust unset --if-invalid
130+
}

dev-lang/rust/rust-99.ebuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
1818
SLOT="beta"
1919
KEYWORDS=""
2020

21-
IUSE="clang debug doc libcxx +system-llvm"
21+
IUSE="clang debug doc libcxx"
2222
REQUIRED_USE="libcxx? ( clang )"
2323

2424
CDEPEND="libcxx? ( sys-libs/libcxx )
@@ -30,7 +30,6 @@ DEPEND="${CDEPEND}
3030
>=dev-lang/perl-5.0
3131
net-misc/wget
3232
clang? ( sys-devel/clang )
33-
system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
3433
"
3534
RDEPEND="${CDEPEND}
3635
"
@@ -53,6 +52,8 @@ src_unpack() {
5352
src_prepare() {
5453
local postfix="gentoo-${SLOT}"
5554
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
55+
find mk -name '*.mk' -exec \
56+
sed -i -e "s/-Werror / /g" {} \; || die
5657
epatch "${FILESDIR}/${PN}-1.1.0-install.patch"
5758
}
5859

@@ -73,7 +74,6 @@ src_configure() {
7374
$(use_enable !debug optimize-tests) \
7475
$(use_enable doc docs) \
7576
$(use_enable libcxx libcpp) \
76-
$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
7777
|| die
7878
}
7979

dev-lang/rust/rust-999.ebuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
1818
SLOT="nightly"
1919
KEYWORDS=""
2020

21-
IUSE="clang debug doc libcxx +system-llvm"
21+
IUSE="clang debug doc libcxx"
2222
REQUIRED_USE="libcxx? ( clang )"
2323

2424
CDEPEND="libcxx? ( sys-libs/libcxx )
@@ -30,7 +30,6 @@ DEPEND="${CDEPEND}
3030
>=dev-lang/perl-5.0
3131
net-misc/wget
3232
clang? ( sys-devel/clang )
33-
system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
3433
"
3534
RDEPEND="${CDEPEND}
3635
"
@@ -53,6 +52,8 @@ src_unpack() {
5352
src_prepare() {
5453
local postfix="gentoo-${SLOT}"
5554
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
55+
find mk -name '*.mk' -exec \
56+
sed -i -e "s/-Werror / /g" {} \; || die
5657
epatch "${FILESDIR}/${PN}-1.1.0-install.patch"
5758
}
5859

@@ -73,7 +74,6 @@ src_configure() {
7374
$(use_enable !debug optimize-tests) \
7475
$(use_enable doc docs) \
7576
$(use_enable libcxx libcpp) \
76-
$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
7777
|| die
7878
}
7979

dev-lang/rust/rust-9999.ebuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
1616
SLOT="git"
1717
KEYWORDS=""
1818

19-
IUSE="clang debug doc libcxx +system-llvm"
19+
IUSE="clang debug doc libcxx"
2020
REQUIRED_USE="libcxx? ( clang )"
2121

2222
CDEPEND="libcxx? ( sys-libs/libcxx )
@@ -27,7 +27,6 @@ DEPEND="${CDEPEND}
2727
${PYTHON_DEPS}
2828
>=dev-lang/perl-5.0
2929
clang? ( sys-devel/clang )
30-
system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
3130
"
3231
RDEPEND="${CDEPEND}
3332
"
@@ -47,6 +46,8 @@ src_unpack() {
4746
src_prepare() {
4847
local postfix="gentoo-${SLOT}"
4948
sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
49+
find mk -name '*.mk' -exec \
50+
sed -i -e "s/-Werror / /g" {} \; || die
5051
epatch "${FILESDIR}/${PN}-1.1.0-install.patch"
5152
}
5253

@@ -66,7 +67,6 @@ src_configure() {
6667
$(use_enable !debug optimize-tests) \
6768
$(use_enable doc docs) \
6869
$(use_enable libcxx libcpp) \
69-
$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
7070
|| die
7171
}
7272

0 commit comments

Comments
 (0)