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: Wed, 31 Jul 2013 09:30:27
Message-Id: 20130731092945.455ED2171C@flycatcher.gentoo.org
1 mgorny 13/07/31 09:29:45
2
3 Modified: llvm-3.3-r1.ebuild llvm-9999-r1.ebuild ChangeLog
4 Log:
5 Make build & install simpler. Since we're calling 'install' for non-native ABIs already, we should also do a full build.
6
7 (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
8
9 Revision Changes Path
10 1.6 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.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?r1=1.5&r2=1.6
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.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- llvm-3.3-r1.ebuild 31 Jul 2013 06:57:18 -0000 1.5
23 +++ llvm-3.3-r1.ebuild 31 Jul 2013 09:29:45 -0000 1.6
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.5 2013/07/31 06:57:18 mgorny Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.6 2013/07/31 09:29:45 mgorny Exp $
29
30 EAPI=5
31
32 @@ -211,22 +211,7 @@
33 }
34
35 multilib_src_compile() {
36 - local mymakeopts=(
37 - VERBOSE=1
38 - REQUIRES_RTTI=1
39 - GENTOO_LIBDIR="$(get_libdir)"
40 - )
41 -
42 - # Tests need all the LLVM built.
43 - if multilib_is_native_abi || use test; then
44 - emake "${mymakeopts[@]}"
45 - else
46 - # we need to build libs for llvm, then whole clang,
47 - # since libs-only omits clang dir
48 - # and clang fails to sub-compile with libs-only.
49 - emake "${mymakeopts[@]}" libs-only
50 - use clang && emake -C tools/clang "${mymakeopts[@]}"
51 - fi
52 + emake VERBOSE=1 REQUIRES_RTTI=1 GENTOO_LIBDIR=$(get_libdir)
53
54 if multilib_is_native_abi && use doc; then
55 emake -C "${S}"/docs -f Makefile.sphinx man html
56 @@ -269,12 +254,7 @@
57 }
58
59 multilib_src_install() {
60 - local mymakeopts=(
61 - DESTDIR="${D}"
62 - GENTOO_LIBDIR="$(get_libdir)"
63 - )
64 -
65 - emake "${mymakeopts[@]}" install
66 + emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
67
68 # Fix rpaths.
69 chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
70
71
72
73 1.7 sys-devel/llvm/llvm-9999-r1.ebuild
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild?rev=1.7&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild?rev=1.7&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild?r1=1.6&r2=1.7
78
79 Index: llvm-9999-r1.ebuild
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v
82 retrieving revision 1.6
83 retrieving revision 1.7
84 diff -u -r1.6 -r1.7
85 --- llvm-9999-r1.ebuild 31 Jul 2013 06:57:18 -0000 1.6
86 +++ llvm-9999-r1.ebuild 31 Jul 2013 09:29:45 -0000 1.7
87 @@ -1,6 +1,6 @@
88 # Copyright 1999-2013 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v 1.6 2013/07/31 06:57:18 mgorny Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999-r1.ebuild,v 1.7 2013/07/31 09:29:45 mgorny Exp $
92
93 EAPI=5
94
95 @@ -191,22 +191,7 @@
96 }
97
98 multilib_src_compile() {
99 - local mymakeopts=(
100 - VERBOSE=1
101 - REQUIRES_RTTI=1
102 - GENTOO_LIBDIR="$(get_libdir)"
103 - )
104 -
105 - # Tests need all the LLVM built.
106 - if multilib_is_native_abi || use test; then
107 - emake "${mymakeopts[@]}"
108 - else
109 - # we need to build libs for llvm, then whole clang,
110 - # since libs-only omits clang dir
111 - # and clang fails to sub-compile with libs-only.
112 - emake "${mymakeopts[@]}" libs-only
113 - use clang && emake -C tools/clang "${mymakeopts[@]}"
114 - fi
115 + emake VERBOSE=1 REQUIRES_RTTI=1 GENTOO_LIBDIR=$(get_libdir)
116
117 if multilib_is_native_abi; then
118 emake -C "${S}"/docs -f Makefile.sphinx man
119 @@ -247,12 +232,7 @@
120 }
121
122 multilib_src_install() {
123 - local mymakeopts=(
124 - DESTDIR="${D}"
125 - GENTOO_LIBDIR="$(get_libdir)"
126 - )
127 -
128 - emake "${mymakeopts[@]}" install
129 + emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
130
131 # Fix rpaths.
132 chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
133
134
135
136 1.125 sys-devel/llvm/ChangeLog
137
138 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.125&view=markup
139 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.125&content-type=text/plain
140 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.124&r2=1.125
141
142 Index: ChangeLog
143 ===================================================================
144 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
145 retrieving revision 1.124
146 retrieving revision 1.125
147 diff -u -r1.124 -r1.125
148 --- ChangeLog 31 Jul 2013 06:57:18 -0000 1.124
149 +++ ChangeLog 31 Jul 2013 09:29:45 -0000 1.125
150 @@ -1,6 +1,11 @@
151 # ChangeLog for sys-devel/llvm
152 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
153 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.124 2013/07/31 06:57:18 mgorny Exp $
154 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.125 2013/07/31 09:29:45 mgorny Exp $
155 +
156 + 31 Jul 2013; Michał Górny <mgorny@g.o> llvm-3.3-r1.ebuild,
157 + llvm-9999-r1.ebuild:
158 + Make build & install simpler. Since we're calling 'install' for non-native
159 + ABIs already, we should also do a full build.
160
161 31 Jul 2013; Michał Górny <mgorny@g.o> llvm-3.3-r1.ebuild,
162 llvm-9999-r1.ebuild:
Report Message
Find on MARC Find on Google Groups