1 |
bicatali 08/01/10 00:08:23 |
2 |
|
3 |
Modified: ChangeLog root-5.16.00-r1.ebuild |
4 |
Log: |
5 |
Added various patches: one to respect flags in xrootd (needed for afs), one to properly handle -truetype without libXft (bug #204725) and last one for postgresql (bug #203015). Added pch use flag for faster compilation with g++ |
6 |
(Portage version: 2.1.4_rc14) |
7 |
|
8 |
Revision Changes Path |
9 |
1.19 sci-physics/root/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.19&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.19&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?r1=1.18&r2=1.19 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v |
18 |
retrieving revision 1.18 |
19 |
retrieving revision 1.19 |
20 |
diff -u -r1.18 -r1.19 |
21 |
--- ChangeLog 16 Dec 2007 17:04:42 -0000 1.18 |
22 |
+++ ChangeLog 10 Jan 2008 00:08:22 -0000 1.19 |
23 |
@@ -1,6 +1,13 @@ |
24 |
# ChangeLog for sci-physics/root |
25 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.18 2007/12/16 17:04:42 markusle Exp $ |
27 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.19 2008/01/10 00:08:22 bicatali Exp $ |
29 |
+ |
30 |
+ 10 Jan 2008; Sébastien Fabbro <bicatali@g.o> |
31 |
+ +files/root-5.16.00-flags.patch, +files/root-5.16.00-postgres.patch, |
32 |
+ +files/root-5.16.00-xft.patch, root-5.16.00-r1.ebuild: |
33 |
+ Added various patches: one to respect flags in xrootd (needed for afs), one |
34 |
+ to properly handle -truetype without libXft (bug #204725) and last one for |
35 |
+ postgresql (bug #203015). Added pch use flag for faster compilation with g++ |
36 |
|
37 |
16 Dec 2007; Markus Dittrich <markusle@g.o> |
38 |
+files/root-5.16.00-afs.patch, root-5.16.00-r1.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.3 sci-physics/root/root-5.16.00-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild?rev=1.3&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild?rev=1.3&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild?r1=1.2&r2=1.3 |
47 |
|
48 |
Index: root-5.16.00-r1.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v |
51 |
retrieving revision 1.2 |
52 |
retrieving revision 1.3 |
53 |
diff -u -r1.2 -r1.3 |
54 |
--- root-5.16.00-r1.ebuild 16 Dec 2007 17:04:42 -0000 1.2 |
55 |
+++ root-5.16.00-r1.ebuild 10 Jan 2008 00:08:22 -0000 1.3 |
56 |
@@ -1,6 +1,6 @@ |
57 |
-# Copyright 1999-2007 Gentoo Foundation |
58 |
+# Copyright 1999-2008 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v 1.2 2007/12/16 17:04:42 markusle Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v 1.3 2008/01/10 00:08:22 bicatali Exp $ |
62 |
|
63 |
inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran |
64 |
|
65 |
@@ -16,10 +16,10 @@ |
66 |
LICENSE="LGPL-2" |
67 |
KEYWORDS="~amd64 ~sparc ~x86" |
68 |
|
69 |
-IUSE="afs cern doc fftw kerberos ldap mysql odbc postgres |
70 |
+IUSE="afs cern doc fftw kerberos ldap mysql odbc pch postgres |
71 |
python ruby qt3 ssl truetype xml" |
72 |
|
73 |
-DEPEND="sys-apps/shadow |
74 |
+RDEPEND="sys-apps/shadow |
75 |
x11-libs/libXpm |
76 |
>=sci-libs/gsl-1.8 |
77 |
dev-libs/libpcre |
78 |
@@ -41,6 +41,9 @@ |
79 |
odbc? ( dev-db/unixODBC ) |
80 |
truetype? ( x11-libs/libXft )" |
81 |
|
82 |
+DEPEND="${RDEPEND} |
83 |
+ dev-util/pkgconfig" |
84 |
+ |
85 |
S="${WORKDIR}/${PN}" |
86 |
|
87 |
pkg_setup() { |
88 |
@@ -48,11 +51,11 @@ |
89 |
elog "You may want to build ROOT with these non Gentoo extra packages:" |
90 |
elog "AliEn, castor, Chirp, clarens, Globus, Monalisa, Oracle, peac, " |
91 |
elog "PYTHIA, PYTHIA6, SapDB, SRP, Venus" |
92 |
- elog "You can use the EXTRA_CONF variable for this." |
93 |
+ elog "You can use the EXTRA_ECONF variable for this." |
94 |
elog "Example, for PYTHIA, you would do: " |
95 |
- elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root" |
96 |
+ elog "EXTRA_ECONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root" |
97 |
elog |
98 |
- epause 10 |
99 |
+ epause 7 |
100 |
if use cern; then |
101 |
FORTRAN="gfortran g77 ifc" |
102 |
fortran_pkg_setup |
103 |
@@ -66,30 +69,36 @@ |
104 |
epatch "${FILESDIR}"/${P}-fortran.patch |
105 |
epatch "${DISTDIR}"/${P}-gcc-4.2.patch.bz2 |
106 |
epatch "${FILESDIR}"/${P}-afs.patch |
107 |
- if [[ ${ARCH} == sparc ]]; then |
108 |
- cd "${S}/xrootd/src" |
109 |
- tar xzf xrootd-20060928-1600.src.tgz |
110 |
- epatch "${FILESDIR}"/sparc-${P}.patch |
111 |
- tar czf xrootd-20060928-1600.src.tgz xrootd |
112 |
- fi |
113 |
+ epatch "${FILESDIR}"/${P}-xft.patch |
114 |
+ epatch "${FILESDIR}"/${P}-postgres.patch |
115 |
+ cd "${S}"/xrootd/src |
116 |
+ tar xzf xrootd-20060928-1600.src.tgz |
117 |
+ epatch "${FILESDIR}"/sparc-${P}.patch |
118 |
+ epatch "${FILESDIR}"/${P}-flags.patch |
119 |
+ tar czf xrootd-20060928-1600.src.tgz xrootd |
120 |
} |
121 |
|
122 |
src_compile() { |
123 |
|
124 |
local target |
125 |
+ local myconf="--disable-pch" |
126 |
+ use pch && myconf="--enable-pch" |
127 |
if [[ "$(tc-getCXX)" == icc* ]]; then |
128 |
if use amd64; then |
129 |
target=linuxx8664icc |
130 |
elif use x86; then |
131 |
target=linuxicc |
132 |
fi |
133 |
+ myconf="--disable-pch" |
134 |
fi |
135 |
use afs && append-flags -DAFS_OLD_COM_ERR |
136 |
+ |
137 |
local myfortran |
138 |
use cern && myfortran="F77=${FORTRANC}" |
139 |
|
140 |
# watch: the configure script is not the standard autotools |
141 |
- # disable-pch: precompiled headers buggy with icc |
142 |
+ # precompiled headers buggy with icc |
143 |
+ |
144 |
|
145 |
./configure ${target} \ |
146 |
--prefix=/usr \ |
147 |
@@ -117,7 +126,6 @@ |
148 |
--disable-chirp \ |
149 |
--disable-dcache \ |
150 |
--disable-globus \ |
151 |
- --disable-pch \ |
152 |
--disable-rfio \ |
153 |
--disable-rpath \ |
154 |
--disable-sapdb \ |
155 |
@@ -154,7 +162,8 @@ |
156 |
$(use_enable ssl) \ |
157 |
$(use_enable truetype xft) \ |
158 |
$(use_enable xml) \ |
159 |
- ${EXTRA_CONF} \ |
160 |
+ ${myconf} \ |
161 |
+ ${EXTRA_ECONF} \ |
162 |
|| die "configure failed" |
163 |
|
164 |
emake \ |
165 |
|
166 |
|
167 |
|
168 |
-- |
169 |
gentoo-commits@l.g.o mailing list |