aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2007-07-05 14:56:13 +0000
committerbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2007-07-05 14:56:13 +0000
commitf8e5eebb564a9632404b93157a14164e152d521d (patch)
tree91145aa6d1d0b500bfe791c7ea1456fc644e1fd1 /sci-physics
parentcernlib.eclass cleanup (diff)
downloadsci-f8e5eebb564a9632404b93157a14164e152d521d.tar.gz
sci-f8e5eebb564a9632404b93157a14164e152d521d.tar.bz2
sci-f8e5eebb564a9632404b93157a14164e152d521d.zip
sci-physics/root: root: added truetype option, fixed intel and fortran compilers support
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@665 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/root/ChangeLog4
-rw-r--r--sci-physics/root/Manifest20
-rw-r--r--sci-physics/root/files/root-5.16.00-fortran.patch165
-rw-r--r--sci-physics/root/root-5.16.00.ebuild45
4 files changed, 210 insertions, 24 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 5d4ad7583..eb64e2233 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Jul 2007; S├ębastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild,
+ +files/root-5.16.00-fortran.patch:
+ added truetype option, fixed intel and fortran compilers support
+
05 Jul 2007; S├ębastien Fabbro <bicatali@gentoo.org> +root-5.16.00.ebuild:
Version bump
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c8e79e5af..6426552ca 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,7 @@
+AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec
+MD5 4d5db674fa620228fe7e50057ac40e95 files/root-5.16.00-fortran.patch 5076
+RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 files/root-5.16.00-fortran.patch 5076
+SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec files/root-5.16.00-fortran.patch 5076
AUX sparc-root-5.14.00f.patch 1923 RMD160 ea2e0a0d1cc057723738e128a8e52db32a20e573 SHA1 3809bc7bbcd3ae91f664c1f09781928f0a5605f4 SHA256 793af6821f9bd824346f8f4dde3a909ce7eef27db5d95d445c7dea52941603ef
MD5 d3447020df0ccd1186805fa2109ac1be files/sparc-root-5.14.00f.patch 1923
RMD160 ea2e0a0d1cc057723738e128a8e52db32a20e573 files/sparc-root-5.14.00f.patch 1923
@@ -9,14 +13,14 @@ EBUILD root-5.14.00f.ebuild 4959 RMD160 4c7234823dd1562d8f172292b0ded7146ef151d9
MD5 1f1f974547d66db554d16868634cc457 root-5.14.00f.ebuild 4959
RMD160 4c7234823dd1562d8f172292b0ded7146ef151d9 root-5.14.00f.ebuild 4959
SHA256 d01803904dc8ad2a1d88ac14f0e36a95af5031962245c61dfa104847ba56826d root-5.14.00f.ebuild 4959
-EBUILD root-5.16.00.ebuild 4183 RMD160 420a4c1890cf8fcd87df228f07ec249952e1c433 SHA1 4dfe02dd9ecc43474c90c144a531d29d29ba9528 SHA256 f3a3deb20c767507342e88188601591fc825e4a00801aeee81a31a2282559420
-MD5 1451a394cf777a297b090ac965dbe6f6 root-5.16.00.ebuild 4183
-RMD160 420a4c1890cf8fcd87df228f07ec249952e1c433 root-5.16.00.ebuild 4183
-SHA256 f3a3deb20c767507342e88188601591fc825e4a00801aeee81a31a2282559420 root-5.16.00.ebuild 4183
-MISC ChangeLog 564 RMD160 48bb79aa5f8eece2fadb1fecea5f2ed44ea29094 SHA1 015c0864a4824f638573f50176dec517bb4591f6 SHA256 c8126168522331351a2890032ea959a73133f85b3913f6ca769233fc750d6f41
-MD5 9982af349fe4fc9d625c243ac110fec8 ChangeLog 564
-RMD160 48bb79aa5f8eece2fadb1fecea5f2ed44ea29094 ChangeLog 564
-SHA256 c8126168522331351a2890032ea959a73133f85b3913f6ca769233fc750d6f41 ChangeLog 564
+EBUILD root-5.16.00.ebuild 4490 RMD160 4057265dea324446b505bfa4dd5f5cbb9b5eca0d SHA1 a904db6993cbf7184dc0fcec0fdfaa7b60472a34 SHA256 739c03be192248e09ab4b0da90c8b968e30350d52677eed6990a16364add6118
+MD5 97656db6b95ee39f4e243f3b5019361a root-5.16.00.ebuild 4490
+RMD160 4057265dea324446b505bfa4dd5f5cbb9b5eca0d root-5.16.00.ebuild 4490
+SHA256 739c03be192248e09ab4b0da90c8b968e30350d52677eed6990a16364add6118 root-5.16.00.ebuild 4490
+MISC ChangeLog 745 RMD160 429174aa97a6674fab3721e60a7043d0d2f1b475 SHA1 364c67a0d369f37fd8bfa5c072c763f4178fb8ed SHA256 8a9fe8201105973de892df3c33a968f7dad2e22e7e05683e3f08ee53719f12ef
+MD5 0430fd53a364c83c092bbe3d6356d609 ChangeLog 745
+RMD160 429174aa97a6674fab3721e60a7043d0d2f1b475 ChangeLog 745
+SHA256 8a9fe8201105973de892df3c33a968f7dad2e22e7e05683e3f08ee53719f12ef ChangeLog 745
MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597
RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597
diff --git a/sci-physics/root/files/root-5.16.00-fortran.patch b/sci-physics/root/files/root-5.16.00-fortran.patch
new file mode 100644
index 000000000..c7c918312
--- /dev/null
+++ b/sci-physics/root/files/root-5.16.00-fortran.patch
@@ -0,0 +1,165 @@
+diff -Nur config.orig/Makefile.linux config/Makefile.linux
+--- config.orig/Makefile.linux 2007-05-30 11:59:15.000000000 +0100
++++ config/Makefile.linux 2007-07-05 15:17:22.000000000 +0100
+@@ -44,7 +44,8 @@
+ CRYPTLIBS = -lcrypt
+
+ # Fortran:
+-F77 =
++F77 = gfortran
++
+ ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
+ ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
+ F77 = gfortran
+@@ -53,7 +54,8 @@
+ F77LD = gfortran
+ endif
+ endif
+-ifneq ($(F77),gfortran)
++
++ifeq ($(F77),g77)
+ F77 = g77
+ F77FLAGS = -fPIC
+ ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
+@@ -63,4 +65,11 @@
+ endif
+ endif
+
++ifeq ($(F77),ifort)
++F77 = ifort
++F77FLAGS = -fPIC
++F77LIBS := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
++ -lifcore
++endif
++
+ # Extras
+diff -Nur config.orig/Makefile.linuxicc config/Makefile.linuxicc
+--- config.orig/Makefile.linuxicc 2007-02-13 00:23:09.000000000 +0000
++++ config/Makefile.linuxicc 2007-07-05 15:17:55.000000000 +0100
+@@ -67,18 +67,33 @@
+ CRYPTLIBS = -lcrypt
+
+ # Fortran:
+-F77 = ifort
+-F77FLAGS =
+-# check for libg2c and libfrtbegin
+-ifneq ($(shell g77 -print-file-name=libg2c.so),libg2c.so)
+-LIBG2C := $(shell g77 -print-file-name=libg2c.so) -lnsl
++F77 = gfortran
++
++ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
++ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
++F77 = gfortran
++F77FLAGS = -fPIC -std=legacy
++F77LIBS = -lgfortran -lgfortranbegin -lnsl
++F77LD = gfortran
++endif
++endif
++
++ifeq ($(F77),g77)
++F77 = g77
++F77FLAGS = -fPIC
++ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
++F77LIBS := $(shell $(F77) -print-file-name=libg2c.so) -lnsl
+ else
+-LIBG2C := $(shell g77 -print-file-name=libg2c.a) -lnsl
++F77LIBS := $(shell $(F77) -print-file-name=libg2c.a) -lnsl
++endif
++endif
++
++ifeq ($(F77),ifort)
++F77 = ifort
++F77FLAGS = -fPIC
++F77LIBS := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
++ -lifcore
+ endif
+-LIBFRTBEGIN := $(shell g77 -print-file-name=libfrtbegin.a)
+-F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
+- -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
+- -lifcore
+
+ # Precompiled headers:
+ PCHSUPPORTED := $(ENABLEPCH)
+diff -Nur config.orig/Makefile.linuxx8664gcc config/Makefile.linuxx8664gcc
+--- config.orig/Makefile.linuxx8664gcc 2006-06-04 00:48:43.000000000 +0100
++++ config/Makefile.linuxx8664gcc 2007-07-05 15:18:16.000000000 +0100
+@@ -43,6 +43,18 @@
+ CRYPTLIBS = -lcrypt
+
+ # Fortran:
++F77 = gfortran
++
++ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
++ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
++F77 = gfortran
++F77FLAGS = -fPIC -std=legacy
++F77LIBS = -lgfortran -lgfortranbegin -lnsl
++F77LD = gfortran
++endif
++endif
++
++ifeq ($(F77),g77)
+ F77 = g77
+ F77FLAGS = -fPIC
+ ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
+@@ -50,5 +62,13 @@
+ else
+ F77LIBS := $(shell $(F77) -print-file-name=libg2c.a) -lnsl
+ endif
++endif
++
++ifeq ($(F77),ifort)
++F77 = ifort
++F77FLAGS = -fPIC
++F77LIBS := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
++ -lifcore
++endif
+
+ # Extras
+diff -Nur config.orig/Makefile.linuxx8664icc config/Makefile.linuxx8664icc
+--- config.orig/Makefile.linuxx8664icc 2007-01-18 13:00:33.000000000 +0000
++++ config/Makefile.linuxx8664icc 2007-07-05 15:18:32.000000000 +0100
+@@ -67,18 +67,34 @@
+ CRYPTLIBS = -lcrypt
+
+ # Fortran:
+-F77 = ifort
++F77 = gfortran
++
++ifeq ($(shell which gfortran 2>&1 | sed -ne "s/.*\/gfortran/gfortran/p"),gfortran)
++ifeq ($(shell gfortran -print-libgcc-file-name),$(shell $(CC) -print-libgcc-file-name))
++F77 = gfortran
++F77FLAGS = -fPIC -std=legacy
++F77LIBS = -lgfortran -lgfortranbegin -lnsl
++F77LD = gfortran
++endif
++endif
++
++ifeq ($(F77),g77)
++F77 = g77
+ F77FLAGS = -fPIC
+-# check for libg2c and libfrtbegin
+-ifneq ($(shell g77 -print-file-name=libg2c.so),libg2c.so)
+-LIBG2C := $(shell g77 -print-file-name=libg2c.so) -lnsl
++ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
++F77LIBS := $(shell $(F77) -print-file-name=libg2c.so) -lnsl
+ else
+-LIBG2C := $(shell g77 -print-file-name=libg2c.a) -lnsl
++F77LIBS := $(shell $(F77) -print-file-name=libg2c.a) -lnsl
+ endif
+-LIBFRTBEGIN := $(shell g77 -print-file-name=libfrtbegin.a)
+-F77LIBS = $(LIBFRTBEGIN) $(LIBG2C) \
+- -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
+- -lifcore
++endif
++
++ifeq ($(F77),ifort)
++F77 = ifort
++F77FLAGS = -fPIC
++F77LIBS := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
++ -lifcore
++endif
++
+
+ # Precompiled headers:
+ PCHSUPPORTED := $(ENABLEPCH)
diff --git a/sci-physics/root/root-5.16.00.ebuild b/sci-physics/root/root-5.16.00.ebuild
index 4a6e5d79e..6c18a5d1f 100644
--- a/sci-physics/root/root-5.16.00.ebuild
+++ b/sci-physics/root/root-5.16.00.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
LICENSE="LGPL-2"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE="afs cern doc fftw kerberos ldap mysql odbc opengl postgres
- python ruby qt3 ssl xml"
+ python ruby qt3 ssl truetype xml"
DEPEND="sys-apps/shadow
>=sci-libs/gsl-1.8
@@ -35,19 +35,21 @@ DEPEND="sys-apps/shadow
ssl? ( dev-libs/openssl )
xml? ( dev-libs/libxml2 )
cern? ( sci-physics/cernlib )
- odbc? ( dev-db/unixODBC )"
+ odbc? ( dev-db/unixODBC )
+ truetype? ( x11-libs/libXft )"
S=${WORKDIR}/${PN}
pkg_setup() {
elog
elog "You may want to build ROOT with these non Gentoo extra packages:"
- elog "AliEn, castor, Chirp, Globus, Monalisa, Oracle, peac, "
+ elog "AliEn, castor, Chirp, clarens, Globus, Monalisa, Oracle, peac, "
elog "PYTHIA, PYTHIA6, SapDB, SRP, Venus"
elog "You can use the EXTRA_CONF variable for this."
elog "Example, for PYTHIA, you would do: "
elog "EXTRA_CONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\" emerge root"
elog
+ elog "You can also build root with icc, simply by letting CC=icc"
if use cern; then
FORTRAN="gfortran g77 ifc"
@@ -56,17 +58,34 @@ pkg_setup() {
}
src_unpack() {
-
if use cern; then
fortran_src_unpack
else
unpack ${A}
fi
+ cd "${S}"
+ # patch to properly set link flags with fortran compilers
+ epatch "${FILESDIR}"/${P}-fortran.patch
}
src_compile() {
- # the configure script is not the standard autotools
- ./configure ${EXTRA_CONF} \
+
+ local target
+ if [[ "$(tc-getCC)" == icc* ]]; then
+ if use amd64; then
+ target=linuxx8664icc
+ elif use x86; then
+ target=linuxicc
+ fi
+ fi
+
+ local myfortran
+ use cern && myfortran="F77=${FORTRANC}"
+
+ # watch: the configure script is not the standard autotools
+ # disable-pch: precompiled headers buggy with icc
+
+ ./configure ${target} \
--prefix=/usr \
--bindir=/usr/bin \
--mandir=/usr/share/man/man1 \
@@ -92,6 +111,7 @@ src_compile() {
--disable-chirp \
--disable-dcache \
--disable-globus \
+ --disable-pch \
--disable-rfio \
--disable-rpath \
--disable-sapdb \
@@ -110,7 +130,6 @@ src_compile() {
--enable-shared \
--enable-soversion \
--enable-table \
- --enable-thread \
--enable-unuran \
--enable-xrootd \
$(use_enable afs) \
@@ -127,17 +146,11 @@ src_compile() {
$(use_enable qt3 qtgsi) \
$(use_enable ruby) \
$(use_enable ssl) \
+ $(use_enable truetype xft) \
$(use_enable xml) \
+ ${EXTRA_CONF} \
|| die "configure failed"
- local myfortran
- if use cern; then
- myfortran="F77=${FORTRANC} F77LD=${FORTRANC}"
- if [[ "${FORTRANC}" == "g77" ]]; then
- myfortran="${myfortran} F77LIBS=-lg2c"
- else
- myfortran="${myfortran} F77LIBS=-lgfortran"
- fi
- fi
+
emake \
OPTFLAGS="${CXXFLAGS}" \
${myfortran} \