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.3-r1.ebuild llvm-9999-r1.ebuild ChangeLog
Date: Tue, 30 Jul 2013 14:04:18
Message-Id: 20130730140413.1FFB82171C@flycatcher.gentoo.org
1 mgorny 13/07/30 14:04:13
2
3 Modified: llvm-3.3-r1.ebuild llvm-9999-r1.ebuild ChangeLog
4 Log:
5 Revert the RPATH changes and LD_LIBRARY_PATH hack as it resulted in system clang using build tree libraries, bug #478348. Instead, alter the RPATH after installing the libs. Fix installing libLTO and libprofile_rt.
6
7 (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
8
9 Revision Changes Path
10 1.3 sys-devel/llvm/llvm-3.3-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: llvm-3.3-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- llvm-3.3-r1.ebuild 28 Jul 2013 15:59:24 -0000 1.2
23 +++ llvm-3.3-r1.ebuild 30 Jul 2013 14:04:12 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 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.3-r1.ebuild,v 1.2 2013/07/28 15:59:24 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.3 2013/07/30 14:04:12 mgorny Exp $
29
30 EAPI=5
31
32 @@ -22,7 +22,8 @@
33 IUSE="clang debug doc gold kernel_FreeBSD +libffi multitarget ocaml python
34 +static-analyzer test udis86 video_cards_radeon"
35
36 -DEPEND="dev-lang/perl
37 +DEPEND="app-admin/chrpath
38 + dev-lang/perl
39 >=sys-devel/make-3.79
40 >=sys-devel/flex-2.5.4
41 >=sys-devel/bison-1.875d
42 @@ -122,9 +123,6 @@
43 epatch "${FILESDIR}"/${PN}-3.3-gentoo-install.patch
44 use clang && epatch "${FILESDIR}"/clang-3.3-gentoo-install.patch
45
46 - # Fix insecure RPATHs that were removed upstream already.
47 - epatch "${FILESDIR}"/${P}-insecure-rpath.patch
48 -
49 local sub_files=(
50 Makefile.config.in
51 Makefile.rules
52 @@ -150,19 +148,6 @@
53 epatch_user
54 }
55
56 -llvm_add_ldpath() {
57 - # Add LLVM built libraries to LD_LIBRARY_PATH.
58 - # This way we don't have to hack RPATHs of executables.
59 - local libpath
60 - if use debug; then
61 - libpath=${BUILD_DIR}/Debug+Asserts+Checks/lib
62 - else
63 - libpath=${BUILD_DIR}/Release/lib
64 - fi
65 -
66 - export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
67 -}
68 -
69 multilib_src_configure() {
70 local CONF_FLAGS="--enable-keep-symbols
71 --enable-shared
72 @@ -226,9 +211,6 @@
73 GENTOO_LIBDIR="$(get_libdir)"
74 )
75
76 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
77 - llvm_add_ldpath
78 -
79 # Tests need all the LLVM built.
80 if multilib_is_native_abi || use test; then
81 emake "${mymakeopts[@]}"
82 @@ -259,9 +241,6 @@
83 }
84
85 multilib_src_test() {
86 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
87 - llvm_add_ldpath
88 -
89 default
90
91 use clang && emake -C tools/clang test
92 @@ -289,24 +268,18 @@
93 GENTOO_LIBDIR="$(get_libdir)"
94 )
95
96 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
97 - llvm_add_ldpath
98 + emake "${mymakeopts[@]}" install
99
100 - if multilib_is_native_abi; then
101 - emake "${mymakeopts[@]}" install
102 + # Fix rpaths.
103 + chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
104 + "${ED}"/usr/bin/* || die
105
106 + if multilib_is_native_abi; then
107 # Move files back.
108 if path_exists -o "${ED}"/tmp/llvm-config.*; then
109 mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
110 fi
111 else
112 - # we need to install libs for llvm, then whole clang
113 - # since libs-only omits clang dir
114 - # and clang install-libs doesn't install headers and stuff
115 - # (we build it anyway, so install is not a problem)
116 - emake "${mymakeopts[@]}" install-libs
117 - use clang && emake -C tools/clang "${mymakeopts[@]}" install
118 -
119 # Preserve ABI-variant of llvm-config,
120 # then drop all the executables since LLVM doesn't like to
121 # clobber when installing.
122
123
124
125 1.4 sys-devel/llvm/llvm-9999-r1.ebuild
126
127 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild?rev=1.4&view=markup
128 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild?rev=1.4&content-type=text/plain
129 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild?r1=1.3&r2=1.4
130
131 Index: llvm-9999-r1.ebuild
132 ===================================================================
133 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v
134 retrieving revision 1.3
135 retrieving revision 1.4
136 diff -u -r1.3 -r1.4
137 --- llvm-9999-r1.ebuild 28 Jul 2013 15:59:24 -0000 1.3
138 +++ llvm-9999-r1.ebuild 30 Jul 2013 14:04:12 -0000 1.4
139 @@ -1,6 +1,6 @@
140 # Copyright 1999-2013 Gentoo Foundation
141 # Distributed under the terms of the GNU General Public License v2
142 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v 1.3 2013/07/28 15:59:24 aballier Exp $
143 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v 1.4 2013/07/30 14:04:12 mgorny Exp $
144
145 EAPI=5
146
147 @@ -20,7 +20,8 @@
148 IUSE="clang debug doc gold +libffi multitarget ocaml python
149 +static-analyzer test udis86 video_cards_radeon"
150
151 -DEPEND="dev-lang/perl
152 +DEPEND="app-admin/chrpath
153 + dev-lang/perl
154 dev-python/sphinx
155 >=sys-devel/make-3.79
156 >=sys-devel/flex-2.5.4
157 @@ -129,19 +130,6 @@
158 epatch_user
159 }
160
161 -llvm_add_ldpath() {
162 - # Add LLVM built libraries to LD_LIBRARY_PATH.
163 - # This way we don't have to hack RPATHs of executables.
164 - local libpath
165 - if use debug; then
166 - libpath=${BUILD_DIR}/Debug+Asserts+Checks/lib
167 - else
168 - libpath=${BUILD_DIR}/Release/lib
169 - fi
170 -
171 - export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
172 -}
173 -
174 multilib_src_configure() {
175 local CONF_FLAGS="--enable-keep-symbols
176 --enable-shared
177 @@ -203,9 +191,6 @@
178 GENTOO_LIBDIR="$(get_libdir)"
179 )
180
181 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
182 - llvm_add_ldpath
183 -
184 # Tests need all the LLVM built.
185 if multilib_is_native_abi || use test; then
186 emake "${mymakeopts[@]}"
187 @@ -237,9 +222,6 @@
188 }
189
190 multilib_src_test() {
191 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
192 - llvm_add_ldpath
193 -
194 default
195
196 use clang && emake -C tools/clang test
197 @@ -264,24 +246,18 @@
198 GENTOO_LIBDIR="$(get_libdir)"
199 )
200
201 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
202 - llvm_add_ldpath
203 + emake "${mymakeopts[@]}" install
204
205 - if multilib_is_native_abi; then
206 - emake "${mymakeopts[@]}" install
207 + # Fix rpaths.
208 + chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
209 + "${ED}"/usr/bin/* || die
210
211 + if multilib_is_native_abi; then
212 # Move files back.
213 if path_exists -o "${ED}"/tmp/llvm-config.*; then
214 mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
215 fi
216 else
217 - # we need to install libs for llvm, then whole clang
218 - # since libs-only omits clang dir
219 - # and clang install-libs doesn't install headers and stuff
220 - # (we build it anyway, so install is not a problem)
221 - emake "${mymakeopts[@]}" install-libs
222 - use clang && emake -C tools/clang "${mymakeopts[@]}" install
223 -
224 # Preserve ABI-variant of llvm-config,
225 # then drop all the executables since LLVM doesn't like to
226 # clobber when installing.
227
228
229
230 1.121 sys-devel/llvm/ChangeLog
231
232 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.121&view=markup
233 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.121&content-type=text/plain
234 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.120&r2=1.121
235
236 Index: ChangeLog
237 ===================================================================
238 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
239 retrieving revision 1.120
240 retrieving revision 1.121
241 diff -u -r1.120 -r1.121
242 --- ChangeLog 28 Jul 2013 15:59:24 -0000 1.120
243 +++ ChangeLog 30 Jul 2013 14:04:12 -0000 1.121
244 @@ -1,6 +1,13 @@
245 # ChangeLog for sys-devel/llvm
246 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
247 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.120 2013/07/28 15:59:24 aballier Exp $
248 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.121 2013/07/30 14:04:12 mgorny Exp $
249 +
250 + 30 Jul 2013; Michał Górny <mgorny@g.o>
251 + files/llvm-3.3-gentoo-install.patch, files/llvm-3.4-gentoo-install.patch,
252 + llvm-3.3-r1.ebuild, llvm-9999-r1.ebuild:
253 + Revert the RPATH changes and LD_LIBRARY_PATH hack as it resulted in system
254 + clang using build tree libraries, bug #478348. Instead, alter the RPATH after
255 + installing the libs. Fix installing libLTO and libprofile_rt.
256
257 28 Jul 2013; Alexis Ballier <aballier@g.o> llvm-3.3.ebuild,
258 llvm-3.3-r1.ebuild, llvm-9999.ebuild, llvm-9999-r1.ebuild:
Report Message
Find on MARC Find on Google Groups