Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26758
Modified Files:
root5.info root5.patch
Log Message:
Upstream patch release, fix h2root crash on 64-bit machines, and avoid warnings
for already loaded libs removing libs linked to root.exe from rootmaps.
Index: root5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/root5.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- root5.patch 5 Jan 2009 15:55:50 -0000 1.21
+++ root5.patch 28 Mar 2009 07:22:41 -0000 1.22
@@ -662,3 +662,424 @@
print " -m | --methods : gives methods to be run (default: all
methods)"
print " -i | --inputfile : name of input ROOT file (default: '%s')" %
DEFAULT_INFNAME
print " -o | --outputfile : name of output ROOT file containing results
(default: '%s')" % DEFAULT_OUTFNAME
+Index: main/src/h2root.cxx
+===================================================================
+--- main/src/h2root.cxx (revision 27001)
++++ main/src/h2root.cxx (working copy)
+@@ -35,22 +35,29 @@
+ #include "TMath.h"
+
+ // Define the names of the Fortran common blocks for the different OSs
+-
++// Note that with gcc3.4 or above the size of PAWC_SIZE must be the same
++// as in the Fortran definition in hbook.f and zebra
++// Also, the arrays must be declared extern like on Windows
+ #ifndef WIN32
+-#define PAWC_SIZE 5000000
++#define PAWC_SIZE 4000000
+ # define pawc pawc_
+ # define quest quest_
+ # define hcbits hcbits_
+ # define hcbook hcbook_
+ # define rzcl rzcl_
+-int pawc[PAWC_SIZE];
+-int quest[100];
+-int hcbits[37];
+-int hcbook[51];
+-int rzcl[11];
++//int pawc[PAWC_SIZE];
++//int quest[100];
++//int hcbits[37];
++//int hcbook[51];
++//int rzcl[11];
++extern "C" int pawc[PAWC_SIZE];
++extern "C" int quest[100];
++extern "C" int hcbits[37];
++extern "C" int hcbook[51];
++extern "C" int rzcl[11];
+ #else
+ // on windows /pawc/ must have the same length as in libPacklib.a !!
+-#define PAWC_SIZE 2000000
++#define PAWC_SIZE 4000000
+ # define pawc PAWC
+ # define quest QUEST
+ # define hcbits HCBITS
+Index: main/src/setpawc.c
+===================================================================
+--- main/src/setpawc.c (revision 27001)
++++ main/src/setpawc.c (working copy)
+@@ -7,5 +7,5 @@
+ //*-- for the /PAWC/ common block for H2Root C++ utility.
+ //*-- This common is defined as "external" in the H2Root and
+ //*-- its size is ignored by linker.
+-int PAWC[2000000];
++int PAWC[4000000];
+ void setpawc(){}
+Index: misc/minicern/src/hbook.f
+===================================================================
+--- misc/minicern/src/hbook.f (revision 27001)
++++ misc/minicern/src/hbook.f (working copy)
+@@ -26,7 +26,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -163,7 +163,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -380,7 +380,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -613,7 +613,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -665,7 +665,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -708,7 +708,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -803,7 +803,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -912,7 +912,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -990,7 +990,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1078,7 +1078,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1185,7 +1185,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1548,7 +1548,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1597,7 +1597,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1693,7 +1693,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1812,7 +1812,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1864,7 +1864,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1912,7 +1912,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -1955,7 +1955,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2093,7 +2093,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2217,7 +2217,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2329,7 +2329,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2389,7 +2389,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2488,7 +2488,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2732,7 +2732,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2783,7 +2783,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2854,7 +2854,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -2940,7 +2940,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3077,7 +3077,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3232,7 +3232,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3280,7 +3280,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3328,7 +3328,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3377,7 +3377,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3497,7 +3497,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3563,7 +3563,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3620,7 +3620,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3678,7 +3678,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3773,7 +3773,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3846,7 +3846,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+@@ -3963,7 +3963,7 @@
+ INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU, LMAIN
+ REAL FENC , HCV
+ COMMON/PAWC/NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,FENC(5),LMAIN,
+- +HCV(2000000-11)
++ +HCV(4000000-11)
+ INTEGER IQ ,LQ
+ REAL Q
+ DIMENSION IQ(2),Q(2),LQ(8000)
+Index: misc/minicern/src/zebra.f
+===================================================================
+--- misc/minicern/src/zebra.f (revision 27001)
++++ misc/minicern/src/zebra.f (working copy)
+@@ -203,7 +203,7 @@
+
+ SUBROUTINE MZPAW (NWORDS,CHOPT)
+ COMMON /PAWC/ NWPAW,IXPAWC,IHBOOK,IXHIGZ,IXKU,IFENCE(5)
+- +, LMAIN, IPAW(9989)
++ +, LMAIN, IPAW(4000000-11)
+ CHARACTER *(*) CHOPT
+ CALL UOPTC (CHOPT,'M',IPAW)
+ IF (IPAW(1).NE.0) CALL MZEBRA(-1)
Index: root5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/root5.info,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- root5.info 5 Jan 2009 15:55:50 -0000 1.39
+++ root5.info 28 Mar 2009 07:22:41 -0000 1.40
@@ -1,6 +1,6 @@
Info3: <<
Package: root5%type_pkg[-cernlib]%type_pkg[-geant4]%type_pkg[-qt]
-Version: 5.22.00
+Version: 5.22.00a
Revision: 11
Type: <<
-cernlib (boolean),
@@ -79,12 +79,12 @@
root5-devel-qt,
<<
Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz
-Source-MD5: 0d621315cf82abb02b2db951461be6f3
+Source-MD5: 7cded54876c9ed99b6723785c42d196c
Source2: http://www-d0.fnal.gov/~mommsen/fink/root_qtgui_20081202.tar.gz
Source2-MD5: 5f23e1e8b5d8139fc060bff3e410bd6a
SourceDirectory: root
PatchFile: %{ni}.patch
-PatchFile-MD5: 849f8c758780601e5d9ad3f878251088
+PatchFile-MD5: 21f6ae7b1f13f9b2e38f5e8ea2601bca
PatchScript: <<
#!/bin/sh -ev
/usr/bin/sed "s:@PREFIX@:%p:" %{PatchFile} | /usr/bin/patch -p0
@@ -151,23 +151,23 @@
/bin/ln -s ../sw/etc/root/system.rootmap .rootmap
make ROOTCONFIG="root-config --prefix=%b" || exit 2
ln -s ../cint/cint/stl/vector.dll .
- ./hsimple || exit 2
- ./stress || exit 2
- ./stressEntryList || exit 2
+ ./hsimple || exit 2
+ ./stress || exit 2
+ ./stressEntryList || exit 2
./stressFit || exit 2
./stressFit Minuit2 || exit 2
- ./stressGeometry || exit 2
- ./stressGraphics || exit 2
- ./stressHistogram || exit 2
- ./stressIterators || exit 2
- ./stressLinear || exit 2
- ./stressMathCore || exit 2
- ./stressMathMore || exit 2
- ./stressRooFit || exit 2
- ./stressShapes || exit 2
- ./stressSpectrum || exit 2
- ./stressTMVA || exit 2
- ./stressVector || exit 2
+ ./stressGeometry || exit 2
+ ./stressGraphics || exit 2
+ ./stressHistogram || exit 2
+ ./stressIterators || exit 2
+ ./stressLinear || exit 2
+ ./stressMathCore || exit 2
+ ./stressMathMore || exit 2
+ ./stressRooFit || exit 2
+ ./stressShapes || exit 2
+ ./stressSpectrum || exit 2
+ ./stressTMVA || exit 2
+ ./stressVector || exit 2
# Cleanup
make distclean
/bin/mv -f Makefile.bak Makefile
@@ -188,6 +188,12 @@
/bin/rm -f %i/lib/root/libpcre.a
# Remove stray SVN stuff
/usr/bin/find %i -name ".svn" -type d -depth -exec rm -rf \{\} \;
+ # Remove libraries linked to root.exe from rootmaps
+ for libs in `/usr/bin/otool -L %i/bin/root.exe | /usr/bin/sed -ne
's:.*%p/lib/root/\([[:alpha:]]*\).*:\1:p'`
+ do
+ /usr/bin/sed -i'.bak' -e "s/\(.*\.so\) ${libs}.so\(.*\)/\1\2/g"
%i/lib/root/*.rootmap
+ done
+ rm -f %i/lib/root/*.rootmap.bak
# Setup python environment
/usr/bin/install -d -m 755 %i/etc/profile.d
cat > %i/etc/profile.d/%n.csh <<CSH
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
