Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16363
Modified Files: root5.info root5.patch Log Message: Fixing path to genreflex.py and depend on new gccxml package needed for genreflex to work. Index: root5.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- root5.patch 5 Jun 2013 10:10:06 -0000 1.14 +++ root5.patch 14 Aug 2013 06:14:33 -0000 1.15 @@ -71,6 +71,23 @@ EXPLLINK=1 +diff --git a/cint/reflex/python/genreflex/genreflex.py b/cint/reflex/python/genreflex/genreflex.py +index 634f4de..0189d83 100644 +--- a/cint/reflex/python/genreflex/genreflex.py ++++ b/cint/reflex/python/genreflex/genreflex.py +@@ -285,9 +285,9 @@ class genreflex: + break + bcomp = os.path.basename(compiler) + vopt = '' +- if bcomp in ('msvc7','msvc71','msvc8') : return s +- elif bcomp in ('gcc','g++','c++') : vopt = '--version' +- elif bcomp in ('cl.exe','cl') : vopt = '' # there is no option to print only the version with cl ++ if bcomp.startswith('msvc') : vopt = 'ms' ++ elif bcomp.startswith('gcc') or bcomp.startswith('g++') or bcomp.startswith('c++') : vopt = '--version' ++ elif bcomp.startswith('cl') : vopt = '' # there is no option to print only the version with cl + else : + print '--->> genreflex: WARNING: While trying to retrieve compiler version, found unknown compiler %s' % compiler + return s diff --git a/config/Makefile.macosx64 b/config/Makefile.macosx64 index 59c32b5..2b94c84 100644 --- a/config/Makefile.macosx64 Index: root5.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.info,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- root5.info 16 Jul 2013 15:48:19 -0000 1.20 +++ root5.info 14 Aug 2013 06:14:33 -0000 1.21 @@ -1,7 +1,7 @@ Info3: << Package: root5%type_pkg[-cernlib]%type_pkg[-pythia] Version: 5.34.09 -Revision: 12 +Revision: 13 Type: << -cernlib (boolean), -pythia (boolean) @@ -11,6 +11,7 @@ Description: Object-oriented data analysis framework Depends: << %n-shlibs (=%v-%r), + gccxml, graphviz, python27, x11 @@ -56,11 +57,13 @@ Source-MD5: 7830d4423e00b1d00740a9cdcac0c18b SourceDirectory: root PatchFile: %{ni}.patch -PatchFile-MD5: 44fd2aa28f33bf5993f9e663dc4377d5 +PatchFile-MD5: f8e64f303bf6ff0cbcdf70af646d5fd9 PatchScript: << patch -p1 < %{PatchFile} /usr/bin/sed -i '.bak' -e 's:python :%p/bin/python2.7 :' bindings/pyroot/Module.mk cint/cintex/Module.mk - /bin/rm -f bindings/pyroot/Module.mk.bak cint/cintex/Module.mk.bak + /usr/bin/sed -i '.bak' -e 's:${ROOTSYS}/lib/python:%p/lib/root/python:' config/genreflex.in + /usr/bin/sed -i '.bak' -e 's:$ROOTSYS:%p:' config/roots.in + /bin/rm -f bindings/pyroot/Module.mk.bak cint/cintex/Module.mk.bak config/genreflex.in.bak config/roots.in.bak << ConfigureParams: << --etcdir=%p/etc/root \ ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs