1 |
markusle 07/12/16 05:05:17 |
2 |
|
3 |
Modified: ChangeLog root-3.05.04.ebuild |
4 |
Added: root-5.16.00-r1.ebuild |
5 |
Log: |
6 |
New revision with patch fixing compile failure under gcc-4.2 (see bug #199591). Also removed afs support until compilation problems are fixed. |
7 |
(Portage version: 2.1.4_rc9) |
8 |
|
9 |
Revision Changes Path |
10 |
1.17 sci-physics/root/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.17&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.17&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?r1=1.16&r2=1.17 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v |
19 |
retrieving revision 1.16 |
20 |
retrieving revision 1.17 |
21 |
diff -u -r1.16 -r1.17 |
22 |
--- ChangeLog 9 Dec 2007 17:35:12 -0000 1.16 |
23 |
+++ ChangeLog 16 Dec 2007 05:05:17 -0000 1.17 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for sci-physics/root |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.16 2007/12/09 17:35:12 bicatali Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.17 2007/12/16 05:05:17 markusle Exp $ |
29 |
+ |
30 |
+*root-5.16.00-r1 (15 Dec 2007) |
31 |
+ |
32 |
+ 15 Dec 2007; Markus Dittrich <markusle@g.o> |
33 |
+ +root-5.16.00-r1.ebuild: |
34 |
+ New revision with patch fixing compile failure under gcc-4.2 |
35 |
+ (see bug #199591). Also removed afs support until compilation |
36 |
+ problems are fixed. |
37 |
|
38 |
09 Dec 2007; Sébastien Fabbro <bicatali@g.o> -root-4.02.00.ebuild, |
39 |
root-5.16.00.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.4 sci-physics/root/root-3.05.04.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-3.05.04.ebuild?rev=1.4&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-3.05.04.ebuild?rev=1.4&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-3.05.04.ebuild?r1=1.3&r2=1.4 |
48 |
|
49 |
Index: root-3.05.04.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.05.04.ebuild,v |
52 |
retrieving revision 1.3 |
53 |
retrieving revision 1.4 |
54 |
diff -u -r1.3 -r1.4 |
55 |
--- root-3.05.04.ebuild 22 Jul 2007 06:53:29 -0000 1.3 |
56 |
+++ root-3.05.04.ebuild 16 Dec 2007 05:05:17 -0000 1.4 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2007 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.05.04.ebuild,v 1.3 2007/07/22 06:53:29 dberkholz Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-3.05.04.ebuild,v 1.4 2007/12/16 05:05:17 markusle Exp $ |
62 |
|
63 |
inherit flag-o-matic eutils |
64 |
|
65 |
@@ -25,7 +25,7 @@ |
66 |
|
67 |
src_unpack() { |
68 |
unpack ${A} |
69 |
- cd ${S} |
70 |
+ cd "${S}" |
71 |
#epatch ${FILESDIR}/root-makefile.patch |
72 |
#epatch ${FILESDIR}/pgsql-no-libpq-int.patch |
73 |
} |
74 |
@@ -64,8 +64,8 @@ |
75 |
} |
76 |
|
77 |
src_install() { |
78 |
- make DESTDIR=${D} INSTALL="install" install || die |
79 |
+ make DESTDIR="${D}" INSTALL="install" install || die |
80 |
|
81 |
dodir /etc/env.d |
82 |
- echo "LDPATH=/usr/lib/root" > ${D}/etc/env.d/60root |
83 |
+ echo "LDPATH=/usr/lib/root" > "${D}"/etc/env.d/60root |
84 |
} |
85 |
|
86 |
|
87 |
|
88 |
1.1 sci-physics/root/root-5.16.00-r1.ebuild |
89 |
|
90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild?rev=1.1&view=markup |
91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild?rev=1.1&content-type=text/plain |
92 |
|
93 |
Index: root-5.16.00-r1.ebuild |
94 |
=================================================================== |
95 |
# Copyright 1999-2007 Gentoo Foundation |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v 1.1 2007/12/16 05:05:17 markusle Exp $ |
98 |
|
99 |
inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran |
100 |
|
101 |
DOC_PV=$(get_major_version)_$(get_version_component_range 2) |
102 |
|
103 |
DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
104 |
SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz |
105 |
mirror://gentoo/${P}-gcc-4.2.patch.bz2 |
106 |
doc? ( ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf )" |
107 |
HOMEPAGE="http://root.cern.ch/" |
108 |
|
109 |
SLOT="0" |
110 |
LICENSE="LGPL-2" |
111 |
KEYWORDS="~amd64 ~sparc ~x86" |
112 |
|
113 |
IUSE="cern doc fftw kerberos ldap mysql odbc postgres |
114 |
python ruby qt3 ssl truetype xml" |
115 |
|
116 |
DEPEND="sys-apps/shadow |
117 |
x11-libs/libXpm |
118 |
>=sci-libs/gsl-1.8 |
119 |
dev-libs/libpcre |
120 |
virtual/opengl |
121 |
virtual/glu |
122 |
|| ( media-libs/libafterimage x11-wm/afterstep ) |
123 |
mysql? ( virtual/mysql ) |
124 |
postgres? ( dev-db/postgresql ) |
125 |
kerberos? ( virtual/krb5 ) |
126 |
ldap? ( net-nds/openldap ) |
127 |
qt3? ( $(qt_min_version 3.3.4) ) |
128 |
fftw? ( >=sci-libs/fftw-3 ) |
129 |
python? ( dev-lang/python ) |
130 |
ruby? ( dev-lang/ruby ) |
131 |
ssl? ( dev-libs/openssl ) |
132 |
xml? ( dev-libs/libxml2 ) |
133 |
cern? ( sci-physics/cernlib ) |
134 |
odbc? ( dev-db/unixODBC ) |
135 |
truetype? ( x11-libs/libXft )" |
136 |
|
137 |
S="${WORKDIR}/${PN}" |
138 |
|
139 |
pkg_setup() { |
140 |
elog |
141 |
elog "You may want to build ROOT with these non Gentoo extra packages:" |
142 |
elog "AliEn, castor, Chirp, clarens, Globus, Monalisa, Oracle, peac, " |
143 |
elog "PYTHIA, PYTHIA6, SapDB, SRP, Venus" |
144 |
elog "You can use the EXTRA_CONF variable for this." |
145 |
elog "Example, for PYTHIA, you would do: " |
146 |
elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root" |
147 |
elog |
148 |
epause 10 |
149 |
if use cern; then |
150 |
FORTRAN="gfortran g77 ifc" |
151 |
fortran_pkg_setup |
152 |
fi |
153 |
} |
154 |
|
155 |
src_unpack() { |
156 |
unpack ${A} |
157 |
cd "${S}" |
158 |
# patch to properly set link flags with fortran compilers |
159 |
epatch "${FILESDIR}"/${P}-fortran.patch |
160 |
epatch "${DISTDIR}"/${P}-gcc-4.2.patch.bz2 |
161 |
if [[ ${ARCH} == sparc ]]; then |
162 |
cd "${S}/xrootd/src" |
163 |
tar xzf xrootd-20060928-1600.src.tgz |
164 |
epatch "${FILESDIR}"/sparc-${P}.patch |
165 |
tar czf xrootd-20060928-1600.src.tgz xrootd |
166 |
fi |
167 |
} |
168 |
|
169 |
src_compile() { |
170 |
|
171 |
local target |
172 |
if [[ "$(tc-getCXX)" == icc* ]]; then |
173 |
if use amd64; then |
174 |
target=linuxx8664icc |
175 |
elif use x86; then |
176 |
target=linuxicc |
177 |
fi |
178 |
fi |
179 |
#use afs && append-flags -DAFS_OLD_COM_ERR |
180 |
local myfortran |
181 |
use cern && myfortran="F77=${FORTRANC}" |
182 |
|
183 |
# watch: the configure script is not the standard autotools |
184 |
# disable-pch: precompiled headers buggy with icc |
185 |
|
186 |
./configure ${target} \ |
187 |
--prefix=/usr \ |
188 |
--bindir=/usr/bin \ |
189 |
--mandir=/usr/share/man/man1 \ |
190 |
--incdir=/usr/include/${PN} \ |
191 |
--libdir=/usr/$(get_libdir)/${PN} \ |
192 |
--aclocaldir=/usr/share/aclocal/ \ |
193 |
--datadir=/usr/share/${PN} \ |
194 |
--cintincdir=/usr/share/${PN}/cint \ |
195 |
--fontdir=/usr/share/${PN}/fonts \ |
196 |
--iconpath=/usr/share/${PN}/icons \ |
197 |
--macrodir=/usr/share/${PN}/macros \ |
198 |
--srcdir=/usr/share/${PN}/src \ |
199 |
--docdir=/usr/share/doc/${PF} \ |
200 |
--testdir=/usr/share/doc/${PF}/test \ |
201 |
--tutdir=/usr/share/doc/${PF}/tutorial \ |
202 |
--elispdir=/usr/share/emacs/site-lisp \ |
203 |
--etcdir=/etc/${PN} \ |
204 |
--disable-alien \ |
205 |
--disable-builtin-afterimage \ |
206 |
--disable-builtin-freetype \ |
207 |
--disable-builtin-pcre \ |
208 |
--disable-builtin-zlib \ |
209 |
--disable-chirp \ |
210 |
--disable-dcache \ |
211 |
--disable-globus \ |
212 |
--disable-pch \ |
213 |
--disable-rfio \ |
214 |
--disable-rpath \ |
215 |
--disable-sapdb \ |
216 |
--disable-srp \ |
217 |
--enable-asimage \ |
218 |
--enable-astiff \ |
219 |
--enable-cintex \ |
220 |
--enable-exceptions \ |
221 |
--enable-explicitlink \ |
222 |
--enable-gdml \ |
223 |
--enable-mathcore \ |
224 |
--enable-mathmore \ |
225 |
--enable-minuit2 \ |
226 |
--enable-opengl \ |
227 |
--enable-reflex \ |
228 |
--enable-roofit \ |
229 |
--enable-shared \ |
230 |
--enable-soversion \ |
231 |
--enable-table \ |
232 |
--enable-unuran \ |
233 |
--enable-xrootd \ |
234 |
--disable-afs \ |
235 |
$(use_enable cern) \ |
236 |
$(use_enable fftw fftw3) \ |
237 |
$(use_enable kerberos krb5) \ |
238 |
$(use_enable ldap) \ |
239 |
$(use_enable mysql) \ |
240 |
$(use_enable odbc) \ |
241 |
$(use_enable postgres pgsql) \ |
242 |
$(use_enable python) \ |
243 |
$(use_enable qt3 qt) \ |
244 |
$(use_enable qt3 qtgsi) \ |
245 |
$(use_enable ruby) \ |
246 |
$(use_enable ssl) \ |
247 |
$(use_enable truetype xft) \ |
248 |
$(use_enable xml) \ |
249 |
${EXTRA_CONF} \ |
250 |
|| die "configure failed" |
251 |
|
252 |
emake -j1 \ |
253 |
OPTFLAGS="${CXXFLAGS}" \ |
254 |
${myfortran} \ |
255 |
|| die "emake failed" |
256 |
|
257 |
# is this only for windows? not quite sure. |
258 |
emake cintdlls || die "emake cintdlls failed" |
259 |
} |
260 |
|
261 |
src_install() { |
262 |
emake DESTDIR="${D}" install || die "emake install failed" |
263 |
echo "LDPATH=/usr/$(get_libdir)/root" > 99root |
264 |
doenvd 99root || die "doenvd failed" |
265 |
|
266 |
if use doc; then |
267 |
einfo "Installing user's guide and ref manual" |
268 |
insinto /usr/share/doc/${PF} |
269 |
doins "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \ |
270 |
|| die "pdf install failed" |
271 |
fi |
272 |
} |
273 |
|
274 |
|
275 |
|
276 |
-- |
277 |
gentoo-commits@g.o mailing list |