Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/boost: ChangeLog boost-1.35.0-r2.ebuild
Date: Wed, 25 Mar 2009 01:34:17
Message-Id: E1LmI0T-0000Za-6E@stork.gentoo.org
1 dirtyepic 09/03/25 01:34:13
2
3 Modified: ChangeLog boost-1.35.0-r2.ebuild
4 Log:
5 Fix testsuite processing for paludis users.
6 (Portage version: 2.2_rc26/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.148 dev-libs/boost/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.148&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.148&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.147&r2=1.148
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v
18 retrieving revision 1.147
19 retrieving revision 1.148
20 diff -u -r1.147 -r1.148
21 --- ChangeLog 24 Mar 2009 04:51:20 -0000 1.147
22 +++ ChangeLog 25 Mar 2009 01:34:13 -0000 1.148
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-libs/boost
25 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.147 2009/03/24 04:51:20 dirtyepic Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.148 2009/03/25 01:34:13 dirtyepic Exp $
28 +
29 + 25 Mar 2009; Ryan Hill <dirtyepic@g.o> boost-1.35.0-r2.ebuild:
30 + Fix testsuite processing for paludis users.
31
32 24 Mar 2009; Ryan Hill <dirtyepic@g.o> boost-1.35.0-r3.ebuild,
33 boost-1.35.0-r4.ebuild:
34
35
36
37 1.4 dev-libs/boost/boost-1.35.0-r2.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild?rev=1.4&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild?rev=1.4&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild?r1=1.3&r2=1.4
42
43 Index: boost-1.35.0-r2.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v
46 retrieving revision 1.3
47 retrieving revision 1.4
48 diff -u -r1.3 -r1.4
49 --- boost-1.35.0-r2.ebuild 24 Mar 2009 04:28:27 -0000 1.3
50 +++ boost-1.35.0-r2.ebuild 25 Mar 2009 01:34:13 -0000 1.4
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2009 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.3 2009/03/24 04:28:27 dirtyepic Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.4 2009/03/25 01:34:13 dirtyepic Exp $
56
57 inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
58
59 @@ -35,11 +35,11 @@
60 if has test ${FEATURES} ; then
61 CHECKREQS_DISK_BUILD="1024"
62 check_reqs
63 - ewarn "The testsuite may take several hours to run on a modern system."
64 - ewarn "It is normal to see some tests failing, as some are dependent"
65 - ewarn "on compiler version and platform. Unless something weird"
66 - ewarn "happens, the ebuild should continue installing as normal."
67 - ewarn
68 +
69 + ewarn "The tests may take several hours on a recent machine"
70 + ewarn "but they will not fail (unless something weird happens ;-)"
71 + ewarn "This is because the tests depend on the used compiler/-version"
72 + ewarn "and the platform and upstream says that this is normal."
73 ewarn "If you are interested in the results, please take a look at the"
74 ewarn "generated results page:"
75 ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
76 @@ -75,8 +75,10 @@
77 # Please take a look at the boost-build ebuild
78 # for more information.
79
80 - OPTIONS="gentoorelease"
81 - use debug && OPTIONS="gentoodebug"
82 + BUILDNAME="gentoorelease"
83 + use debug && BUILDNAME="gentoodebug"
84 +
85 + OPTIONS="${BUILDNAME}"
86
87 use icu && OPTIONS="${OPTIONS} -sICU_PATH=/usr"
88 if use expat ; then
89 @@ -150,17 +152,6 @@
90 --layout=system \
91 || die "building tools failed"
92 fi
93 -
94 - if has test ${FEATURES} ; then
95 - cd "${S}/tools/regression/build"
96 - bjam -q \
97 - ${OPTIONS} \
98 - --prefix="${D}/usr" \
99 - --layout=system \
100 - process_jam_log compiler_status \
101 - || die "building regression test helpers failed"
102 - fi
103 -
104 }
105
106 src_install () {
107 @@ -221,8 +212,8 @@
108 doins -r share
109 fi
110
111 - if has test ${FEATURES} ; then
112 - cd "${S}/status"
113 + cd "${S}/status"
114 + if [ -f regress.log ]; then
115 docinto status
116 dohtml *.{html,gif} ../boost.png
117 dodoc regress.log
118 @@ -234,6 +225,14 @@
119
120 export BOOST_ROOT=${S}
121
122 + cd "${S}/tools/regression/build"
123 + bjam -q \
124 + ${OPTIONS} \
125 + --prefix="${D}/usr" \
126 + --layout=system \
127 + process_jam_log compiler_status \
128 + || die "building regression test helpers failed"
129 +
130 cd "${S}/status"
131
132 # Some of the test-checks seem to rely on regexps
133 @@ -248,10 +247,7 @@
134 --dump-tests 2>&1 | tee regress.log
135
136 # Postprocessing
137 - process_jam_log=$(find "${S}"/tools/regression/build/bin -name process_jam_log -print);
138 - compiler_status=$(find "${S}"/tools/regression/build/bin -name compiler_status -print);
139 -
140 - cat regress.log | "${process_jam_log}" --v2
141 + cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/${BUILDNAME}/process_jam_log" --v2
142 if test $? != 0 ; then
143 die "Postprocessing the build log failed"
144 fi
145 @@ -261,7 +257,7 @@
146 __EOF__
147
148 # Generate the build log html summary page
149 - "${compiler_status}" --v2 \
150 + "${S}/tools/regression/build/bin/gcc-$(gcc-version)/${BUILDNAME}/compiler_status" --v2 \
151 --comment "${S}/status/comment.html" "${S}" \
152 cs-$(uname).html cs-$(uname)-links.html
153 if test $? != 0 ; then