diff options
author | 2007-08-24 22:09:08 +0000 | |
---|---|---|
committer | 2007-08-24 22:09:08 +0000 | |
commit | ae0c06ba36861830754a9515ff1dc5d745df60f9 (patch) | |
tree | 0326ccc360351b9cacd7b5a3b73d7341aeeb52f2 /sci-physics/root/files | |
parent | unmask cern in use.mask (diff) | |
download | gentoo-2-ae0c06ba36861830754a9515ff1dc5d745df60f9.tar.gz gentoo-2-ae0c06ba36861830754a9515ff1dc5d745df60f9.tar.bz2 gentoo-2-ae0c06ba36861830754a9515ff1dc5d745df60f9.zip |
Version bump. Added cern use flag. Upstream fixed xrootd for sparc and parallell makes.
(Portage version: 2.1.2.12)
Diffstat (limited to 'sci-physics/root/files')
-rw-r--r-- | sci-physics/root/files/digest-root-5.16.00 | 6 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.16.00-fortran.patch | 165 |
2 files changed, 171 insertions, 0 deletions
diff --git a/sci-physics/root/files/digest-root-5.16.00 b/sci-physics/root/files/digest-root-5.16.00 new file mode 100644 index 000000000000..eab76dfaaa06 --- /dev/null +++ b/sci-physics/root/files/digest-root-5.16.00 @@ -0,0 +1,6 @@ +MD5 52332670de3d20f9cd5d7ec5bb87df41 Users_Guide_5_16.pdf 11196352 +RMD160 149c2421b7453273e6e1d849e17b736878ebb316 Users_Guide_5_16.pdf 11196352 +SHA256 c20fb206aa3eff6f3ec034c24483c4ceed04e08a1eef8b117da7956c2f471d34 Users_Guide_5_16.pdf 11196352 +MD5 506e9cc17e700c8ccb2b9d97c98bf307 root_v5.16.00.source.tar.gz 22210601 +RMD160 3e9a29e6b899e3fb0986ef8a7b4a162d4933bf47 root_v5.16.00.source.tar.gz 22210601 +SHA256 41a36d9a469c8b86247aca59317fa40371db846555045679e759f7f332a927f8 root_v5.16.00.source.tar.gz 22210601 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 000000000000..c7c9183127cb --- /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) |