Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-3.4.ebuild llvm-9999.ebuild ChangeLog
Date: Tue, 01 Apr 2014 17:24:11
Message-Id: 20140401172402.597B22005E@flycatcher.gentoo.org
1 mgorny 14/04/01 17:24:02
2
3 Modified: llvm-3.4.ebuild llvm-9999.ebuild ChangeLog
4 Log:
5 Use alternate root install instead of dumb removal to work-around non-clobber install target. Use MULTILIB_CHOST_TOOLS rather than inline code to handle llvm-config, bug #506398.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.10 sys-devel/llvm/llvm-3.4.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild?rev=1.10&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild?rev=1.10&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild?r1=1.9&r2=1.10
15
16 Index: llvm-3.4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v
19 retrieving revision 1.9
20 retrieving revision 1.10
21 diff -u -r1.9 -r1.10
22 --- llvm-3.4.ebuild 31 Mar 2014 21:21:24 -0000 1.9
23 +++ llvm-3.4.ebuild 1 Apr 2014 17:24:02 -0000 1.10
24 @@ -1,13 +1,13 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.9 2014/03/31 21:21:24 mgorny Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.10 2014/04/01 17:24:02 mgorny Exp $
29
30 EAPI=5
31
32 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
33
34 -inherit cmake-utils eutils flag-o-matic multilib multilib-minimal \
35 - python-r1 toolchain-funcs pax-utils check-reqs
36 +inherit cmake-utils eutils flag-o-matic multibuild multilib \
37 + multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
38
39 DESCRIPTION="Low Level Virtual Machine"
40 HOMEPAGE="http://llvm.org/"
41 @@ -69,6 +69,10 @@
42 # so why did it call itself ninja in the first place?
43 CMAKE_MAKEFILE_GENERATOR=emake
44
45 +MULTILIB_CHOST_TOOLS=(
46 + /usr/bin/llvm-config
47 +)
48 +
49 pkg_pretend() {
50 # in megs
51 # !clang !debug !multitarget -O2 400
52 @@ -387,25 +391,15 @@
53 local MAKEARGS
54 set_makeargs
55
56 - emake "${MAKEARGS[@]}" DESTDIR="${D}" install
57 + local root=${D}/_${ABI}
58
59 - # Preserve ABI-variant of llvm-config.
60 - dodir /tmp
61 - mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die
62 + emake "${MAKEARGS[@]}" DESTDIR="${root}" install
63 + multibuild_merge_root "${root}" "${D}"
64
65 if ! multilib_build_binaries; then
66 - # Drop all the executables since LLVM doesn't like to
67 - # clobber when installing.
68 - rm -r "${ED}"/usr/bin || die
69 -
70 # Backwards compat, will be happily removed someday.
71 - dosym "${CHOST}"-llvm-config /tmp/llvm-config.${ABI}
72 + dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
73 else
74 - # Move files back.
75 - mv "${ED}"/tmp/*llvm-config* "${ED}"/usr/bin || die
76 - # Create a symlink for host's llvm-config.
77 - dosym "${CHOST}"-llvm-config /usr/bin/llvm-config
78 -
79 # Install docs.
80 if use doc; then
81 doman "${S}"/docs/_build/man/*.1
82
83
84
85 1.80 sys-devel/llvm/llvm-9999.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.80&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.80&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.79&r2=1.80
90
91 Index: llvm-9999.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
94 retrieving revision 1.79
95 retrieving revision 1.80
96 diff -u -r1.79 -r1.80
97 --- llvm-9999.ebuild 11 Mar 2014 18:40:17 -0000 1.79
98 +++ llvm-9999.ebuild 1 Apr 2014 17:24:02 -0000 1.80
99 @@ -1,13 +1,13 @@
100 # Copyright 1999-2014 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.79 2014/03/11 18:40:17 mgorny Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.80 2014/04/01 17:24:02 mgorny Exp $
104
105 EAPI=5
106
107 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
108
109 -inherit cmake-utils eutils flag-o-matic git-r3 multilib multilib-minimal \
110 - python-r1 toolchain-funcs pax-utils check-reqs
111 +inherit cmake-utils eutils flag-o-matic git-r3 multibuild multilib \
112 + multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
113
114 DESCRIPTION="Low Level Virtual Machine"
115 HOMEPAGE="http://llvm.org/"
116 @@ -65,6 +65,10 @@
117 # so why did it call itself ninja in the first place?
118 CMAKE_MAKEFILE_GENERATOR=emake
119
120 +MULTILIB_CHOST_TOOLS=(
121 + /usr/bin/llvm-config
122 +)
123 +
124 pkg_pretend() {
125 # in megs
126 # !clang !debug !multitarget -O2 400
127 @@ -371,25 +375,15 @@
128 local MAKEARGS
129 set_makeargs
130
131 - emake "${MAKEARGS[@]}" DESTDIR="${D}" install
132 + local root=${D}/_${ABI}
133
134 - # Preserve ABI-variant of llvm-config.
135 - dodir /tmp
136 - mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die
137 + emake "${MAKEARGS[@]}" DESTDIR="${root}" install
138 + multibuild_merge_root "${root}" "${D}"
139
140 if ! multilib_build_binaries; then
141 - # Drop all the executables since LLVM doesn't like to
142 - # clobber when installing.
143 - rm -r "${ED}"/usr/bin || die
144 -
145 # Backwards compat, will be happily removed someday.
146 - dosym "${CHOST}"-llvm-config /tmp/llvm-config.${ABI}
147 + dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
148 else
149 - # Move files back.
150 - mv "${ED}"/tmp/*llvm-config* "${ED}"/usr/bin || die
151 - # Create a symlink for host's llvm-config.
152 - dosym "${CHOST}"-llvm-config /usr/bin/llvm-config
153 -
154 # Install docs.
155 doman "${S}"/docs/_build/man/*.1
156 use clang && doman "${T}"/clang.1
157
158
159
160 1.184 sys-devel/llvm/ChangeLog
161
162 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.184&view=markup
163 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.184&content-type=text/plain
164 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.183&r2=1.184
165
166 Index: ChangeLog
167 ===================================================================
168 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
169 retrieving revision 1.183
170 retrieving revision 1.184
171 diff -u -r1.183 -r1.184
172 --- ChangeLog 31 Mar 2014 21:21:24 -0000 1.183
173 +++ ChangeLog 1 Apr 2014 17:24:02 -0000 1.184
174 @@ -1,6 +1,12 @@
175 # ChangeLog for sys-devel/llvm
176 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
177 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.183 2014/03/31 21:21:24 mgorny Exp $
178 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.184 2014/04/01 17:24:02 mgorny Exp $
179 +
180 + 01 Apr 2014; Michał Górny <mgorny@g.o> llvm-3.4.ebuild,
181 + llvm-9999.ebuild:
182 + Use alternate root install instead of dumb removal to work-around non-clobber
183 + install target. Use MULTILIB_CHOST_TOOLS rather than inline code to handle
184 + llvm-config, bug #506398.
185
186 31 Mar 2014; Michał Górny <mgorny@g.o> llvm-3.3-r1.ebuild,
187 llvm-3.3-r3.ebuild, llvm-3.4.ebuild:
Report Message
Find on MARC Find on Google Groups