1 |
ryao 12/05/26 01:34:57 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: clang-3.1-r1.ebuild |
5 |
Removed: clang-3.1.ebuild |
6 |
Log: |
7 |
Fix bug #406163, bug #409269, bug #417171, bug #417537 and bug #417541 in Clang 3.1 |
8 |
|
9 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.63 sys-devel/clang/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.63&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.63&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?r1=1.62&r2=1.63 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v |
21 |
retrieving revision 1.62 |
22 |
retrieving revision 1.63 |
23 |
diff -u -r1.62 -r1.63 |
24 |
--- ChangeLog 24 May 2012 13:00:09 -0000 1.62 |
25 |
+++ ChangeLog 26 May 2012 01:34:57 -0000 1.63 |
26 |
@@ -1,6 +1,16 @@ |
27 |
# ChangeLog for sys-devel/clang |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.62 2012/05/24 13:00:09 ryao Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.63 2012/05/26 01:34:57 ryao Exp $ |
31 |
+ |
32 |
+*clang-3.1-r1 (26 May 2012) |
33 |
+ |
34 |
+ 26 May 2012; Richard Yao <ryao@g.o> +clang-3.1-r1.ebuild, |
35 |
+ +files/clang-3.1-gentoo-freebsd-fix-cxx-paths.patch, |
36 |
+ +files/clang-3.1-gentoo-freebsd-fix-lib-path.patch, |
37 |
+ +files/clang-3.1-gentoo-linux-fix-cxx-include.patch, |
38 |
+ +files/clang-3.1-gentoo-runtime-gcc-detection.patch, -clang-3.1.ebuild: |
39 |
+ Fix bug #406163, bug #409269, bug #417171, bug #417537 and bug #417541 in |
40 |
+ Clang 3.1 |
41 |
|
42 |
*clang-3.0-r4 (24 May 2012) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 sys-devel/clang/clang-3.1-r1.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-3.1-r1.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-3.1-r1.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: clang-3.1-r1.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2012 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.1-r1.ebuild,v 1.1 2012/05/26 01:34:57 ryao Exp $ |
57 |
|
58 |
EAPI=4 |
59 |
|
60 |
RESTRICT_PYTHON_ABIS="3.*" |
61 |
SUPPORT_PYTHON_ABIS="1" |
62 |
|
63 |
inherit eutils multilib python |
64 |
|
65 |
DESCRIPTION="C language family frontend for LLVM" |
66 |
HOMEPAGE="http://clang.llvm.org/" |
67 |
# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840 |
68 |
SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz |
69 |
http://llvm.org/releases/${PV}/${P}.src.tar.gz" |
70 |
|
71 |
LICENSE="UoI-NCSA" |
72 |
SLOT="0" |
73 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
74 |
IUSE="debug kernel_FreeBSD multitarget +static-analyzer test" |
75 |
|
76 |
DEPEND="static-analyzer? ( dev-lang/perl )" |
77 |
RDEPEND="~sys-devel/llvm-${PV}[multitarget=]" |
78 |
|
79 |
S=${WORKDIR}/llvm-${PV}.src |
80 |
|
81 |
src_prepare() { |
82 |
mv "${WORKDIR}"/clang-${PV}.src "${S}"/tools/clang || die "clang source directory move failed" |
83 |
|
84 |
# Same as llvm doc patches |
85 |
epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch |
86 |
|
87 |
# multilib-strict |
88 |
sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ |
89 |
-i tools/clang/lib/Headers/Makefile \ |
90 |
|| die "clang Makefile failed" |
91 |
sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \ |
92 |
-i tools/clang/runtime/compiler-rt/Makefile \ |
93 |
|| die "compiler-rt Makefile failed" |
94 |
# fix the static analyzer for in-tree install |
95 |
sed -e 's/import ScanView/from clang \0/' \ |
96 |
-i tools/clang/tools/scan-view/scan-view \ |
97 |
|| die "scan-view sed failed" |
98 |
sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \ |
99 |
-i tools/clang/tools/scan-build/scan-build \ |
100 |
|| die "scan-build sed failed" |
101 |
# Set correct path for gold plugin |
102 |
sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \ |
103 |
-i tools/clang/lib/Driver/Tools.cpp \ |
104 |
|| die "gold plugin path sed failed" |
105 |
# Specify python version |
106 |
python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view |
107 |
python_convert_shebangs -r 2 test/Scripts |
108 |
|
109 |
# From llvm src_prepare |
110 |
einfo "Fixing install dirs" |
111 |
sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ |
112 |
-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ |
113 |
-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \ |
114 |
-i Makefile.config.in || die "Makefile.config sed failed" |
115 |
|
116 |
einfo "Fixing rpath and CFLAGS" |
117 |
sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \ |
118 |
-e '/OmitFramePointer/s/-fomit-frame-pointer//' \ |
119 |
-i Makefile.rules || die "rpath sed failed" |
120 |
|
121 |
# Use system llc (from llvm ebuild) for tests |
122 |
sed -e "/^llc_props =/s/os.path.join(llvm_tools_dir, 'llc')/'llc'/" \ |
123 |
-i tools/clang/test/lit.cfg || die "test path sed failed" |
124 |
|
125 |
# Automatically select active system GCC's libraries, bug #406163 |
126 |
epatch "${FILESDIR}"/${P}-gentoo-runtime-gcc-detection.patch |
127 |
|
128 |
# Fix search paths on FreeBSD, bug #409269 |
129 |
epatch "${FILESDIR}"/${P}-gentoo-freebsd-fix-lib-path.patch |
130 |
|
131 |
# Fix regression caused by removal of USE=system-cxx-headers, bug #417541 |
132 |
epatch "${FILESDIR}"/${P}-gentoo-freebsd-fix-cxx-paths.patch |
133 |
|
134 |
# Fix regression that prevents Clang from building itself on Linux, bug #417537 |
135 |
epatch "${FILESDIR}"/${P}-gentoo-linux-fix-cxx-include.patch |
136 |
|
137 |
# User patches |
138 |
epatch_user |
139 |
} |
140 |
|
141 |
src_configure() { |
142 |
local CONF_FLAGS="--enable-shared |
143 |
--with-optimize-option= |
144 |
$(use_enable !debug optimized) |
145 |
$(use_enable debug assertions) |
146 |
$(use_enable debug expensive-checks)" |
147 |
|
148 |
# Setup the search path to include the Prefix includes |
149 |
if use prefix ; then |
150 |
CONF_FLAGS="${CONF_FLAGS} \ |
151 |
--with-c-include-dirs=${EPREFIX}/usr/include:/usr/include" |
152 |
fi |
153 |
|
154 |
if use multitarget; then |
155 |
CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" |
156 |
else |
157 |
CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only" |
158 |
fi |
159 |
|
160 |
if use amd64; then |
161 |
CONF_FLAGS="${CONF_FLAGS} --enable-pic" |
162 |
fi |
163 |
|
164 |
econf ${CONF_FLAGS} |
165 |
} |
166 |
|
167 |
src_compile() { |
168 |
emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only |
169 |
} |
170 |
|
171 |
src_test() { |
172 |
cd "${S}"/test || die "cd failed" |
173 |
emake site.exp |
174 |
|
175 |
cd "${S}"/tools/clang || die "cd clang failed" |
176 |
|
177 |
echo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
178 |
|
179 |
testing() { |
180 |
if ! emake -j1 VERBOSE=1 test; then |
181 |
has test $FEATURES && die "Make test failed. See above for details." |
182 |
has test $FEATURES || eerror "Make test failed. See above for details." |
183 |
fi |
184 |
} |
185 |
python_execute_function testing |
186 |
} |
187 |
|
188 |
src_install() { |
189 |
cd "${S}"/tools/clang || die "cd clang failed" |
190 |
emake KEEP_SYMBOLS=1 DESTDIR="${D}" install |
191 |
|
192 |
if use static-analyzer ; then |
193 |
dobin tools/scan-build/ccc-analyzer |
194 |
dosym ccc-analyzer /usr/bin/c++-analyzer |
195 |
dobin tools/scan-build/scan-build |
196 |
|
197 |
insinto /usr/share/${PN} |
198 |
doins tools/scan-build/scanview.css |
199 |
doins tools/scan-build/sorttable.js |
200 |
|
201 |
cd tools/scan-view || die "cd scan-view failed" |
202 |
dobin scan-view |
203 |
install-scan-view() { |
204 |
insinto "$(python_get_sitedir)"/clang |
205 |
doins Reporter.py Resources ScanView.py startfile.py |
206 |
touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py |
207 |
} |
208 |
python_execute_function install-scan-view |
209 |
fi |
210 |
|
211 |
# Fix install_names on Darwin. The build system is too complicated |
212 |
# to just fix this, so we correct it post-install |
213 |
if [[ ${CHOST} == *-darwin* ]] ; then |
214 |
for lib in libclang.dylib ; do |
215 |
ebegin "fixing install_name of $lib" |
216 |
install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \ |
217 |
"${ED}"/usr/lib/llvm/${lib} |
218 |
eend $? |
219 |
done |
220 |
for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do |
221 |
ebegin "fixing references in ${f##*/}" |
222 |
install_name_tool \ |
223 |
-change "@rpath/libclang.dylib" \ |
224 |
"${EPREFIX}"/usr/lib/llvm/libclang.dylib \ |
225 |
-change "@executable_path/../lib/libLLVM-${PV}.dylib" \ |
226 |
"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \ |
227 |
-change "${S}"/Release/lib/libclang.dylib \ |
228 |
"${EPREFIX}"/usr/lib/llvm/libclang.dylib \ |
229 |
"${ED}"/$f |
230 |
eend $? |
231 |
done |
232 |
fi |
233 |
|
234 |
# Remove unnecessary headers on FreeBSD, bug #417171 |
235 |
use kernel_FreeBSD && rm "${ED}/usr/lib/clang/3.1/include/"{arm_neon,std,float,iso,limits,tgmath,varargs}*.h |
236 |
} |
237 |
|
238 |
pkg_postinst() { |
239 |
python_mod_optimize clang |
240 |
} |
241 |
|
242 |
pkg_postrm() { |
243 |
python_mod_cleanup clang |
244 |
} |