[root/el5: 3/3] Update to 5.34.13
Mattias Ellert
ellert at fedoraproject.org
Wed Dec 4 19:20:06 UTC 2013
commit 1c00eef2cf8d2218bf84c428f25f00326261e0fe
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Dec 4 20:18:36 2013 +0100
Update to 5.34.13
- Remove java-devel build dependency (not needed with Fedora's libhdfs)
- Adapt to pythia8 >= 8.1.80
root-dont-link-jvm.patch | 123 +++++++++++++++++++++++++++++++++++++++++++++
root-pythia8-incdir.patch | 24 +++++++++
root-unuran.patch | 18 +++---
root.spec | 31 ++++++++---
sources | 2 +-
5 files changed, 179 insertions(+), 19 deletions(-)
---
diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch
new file mode 100644
index 0000000..594d7c3
--- /dev/null
+++ b/root-dont-link-jvm.patch
@@ -0,0 +1,123 @@
+diff -ur root-5.34.11.orig/cmake/modules/RootConfiguration.cmake root-5.34.11/cmake/modules/RootConfiguration.cmake
+--- root-5.34.11.orig/cmake/modules/RootConfiguration.cmake 2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/cmake/modules/RootConfiguration.cmake 2013-11-06 09:43:56.008974184 +0100
+@@ -167,10 +167,6 @@
+ set(hdfslib ${HDFS_LIBRARY})
+ set(hdfsincdir ${HDFS_INCLUDE_DIR})
+
+-set(jniincdir ${Java_INCLUDE_DIRS})
+-set(jvmlib ${Java_LIBRARIES})
+-set(jvmlibdir ${Java_LIBRARY_DIR})
+-
+ set(buildalien ${value${alien}})
+ set(alienlibdir ${ALIEN_LIBRARY_DIR})
+ set(alienlib ${ALIEN_LIBRARY})
+diff -ur root-5.34.11.orig/config/Makefile.in root-5.34.11/config/Makefile.in
+--- root-5.34.11.orig/config/Makefile.in 2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/config/Makefile.in 2013-11-06 09:41:09.145976839 +0100
+@@ -198,9 +198,6 @@
+ HDFSLIBDIR := @hdfslibdir@
+ HDFSCLILIB := @hdfslib@
+ HDFSINCDIR := $(filter-out /usr/include, @hdfsincdir@)
+-JNIINCDIR := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
+-JVMCLILIB := @jvmlib@
+-JVMLIBDIR := @jvmlibdir@
+
+ BUILDALIEN := @buildalien@
+ ALIENLIBDIR := @alienlibdir@
+diff -ur root-5.34.11.orig/configure root-5.34.11/configure
+--- root-5.34.11.orig/configure 2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/configure 2013-11-06 09:39:57.651833708 +0100
+@@ -1682,8 +1682,6 @@
+ hdfs-incdir HDFS support, location of hdfs.h
+ hdfs-libdir HDFS support, location of libhdfs
+ iosvers iOS SDK version (6.1, 7.0), default will be latest SDK
+- jni-incdir HDFS support, location of JNI headers
+- jvm-libdir HDFS support, location of JVM library
+ krb5 Kerberos5 support, location of Kerberos distribution
+ krb5-incdir Kerberos5 support, location of krb5.h
+ krb5-libdir Kerberos5 support, location of libkrb5
+@@ -2047,8 +2045,6 @@
+ --with-hdfs-incdir=*) hdfsincdir=$optarg ; enable_hdfs="yes" ;;
+ --with-hdfs-libdir=*) hdfslibdir=$optarg ; enable_hdfs="yes" ;;
+ --with-iosvers=*) iosvers=$optarg ;;
+- --with-jni-incdir=*) jniincdir=$optarg ;;
+- --with-jvm-libdir=*) jvmlibdir=$optarg ;;
+ --with-krb5=*) krb5dir=$optarg ; enable_krb5="yes" ;;
+ --with-krb5-incdir=*) krb5incdir=$optarg ; enable_krb5="yes" ;;
+ --with-krb5-libdir=*) krb5libdir=$optarg ; enable_krb5="yes" ;;
+@@ -4082,17 +4078,6 @@
+ hdfsinc=$found_hdr
+ hdfsincdir=$found_dir
+
+- if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
+- JAVA_HOME=`/usr/libexec/java_home`
+- fi
+-
+- keepincdir=$jniincdir
+- check_header "jni.h" "$jniincdir" \
+- ${JAVA_HOME:+$JAVA_HOME/include} \
+- /usr/java/default/include /usr/include /usr/local/include
+- jniinc=$found_hdr
+- jniincdir=$found_dir
+-
+ check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
+ $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
+ $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
+@@ -4100,26 +4085,12 @@
+ hdfslib=$found_lib
+ hdfslibdir=$found_dir
+
+- check_library "libjvm" "$enable_shared" "$jvmlibdir" \
+- ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
+- ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
+- ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
+- /usr/java/default/jre/lib/amd64/server \
+- /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
+- jvmlib=$found_lib
+- jvmlibdir=$found_dir
+-
+- if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
++ if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
+ enable_hdfs="no"
+ else
+ case $platform in
+ linux)
+- check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
+- if test $link_result -eq 0 ; then
+- enable_hdfs="no"
+- fi
+-
+- check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
++ check_link "$hdfslib" "$hdfslibdir" hdfsConnect
+ if test $link_result -eq 0 ; then
+ enable_hdfs="no"
+ fi
+@@ -6843,9 +6814,6 @@
+ -e "s|@iosvers@|$iosvers|" \
+ -e "s|@iconpath@|$iconpath|" \
+ -e "s|@incdir@|$incdir|" \
+- -e "s|@jniincdir@|$jniincdir|g" \
+- -e "s|@jvmlibdir@|$jvmlibdir|g" \
+- -e "s|@jvmlib@|$jvmlib|g" \
+ -e "s|@krb5incdir@|$krb5incdir|" \
+ -e "s|@krb5lib@|$krb5lib|" \
+ -e "s|@krb5libdir@|$krb5libdir|" \
+diff -ur root-5.34.11.orig/io/hdfs/Module.mk root-5.34.11/io/hdfs/Module.mk
+--- root-5.34.11.orig/io/hdfs/Module.mk 2013-10-31 16:46:31.000000000 +0100
++++ root-5.34.11/io/hdfs/Module.mk 2013-11-06 09:42:21.320111053 +0100
+@@ -44,7 +44,7 @@
+ $(HDFSLIB): $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
+ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
+- "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
++ "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
+
+ $(HDFSDS): $(HDFSH) $(HDFSL) $(ROOTCINTTMPDEP)
+ $(MAKEDIR)
+@@ -68,4 +68,4 @@
+ distclean:: distclean-$(MODNAME)
+
+ ##### extra rules ######
+-$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
++$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
diff --git a/root-pythia8-incdir.patch b/root-pythia8-incdir.patch
new file mode 100644
index 0000000..b0d0af2
--- /dev/null
+++ b/root-pythia8-incdir.patch
@@ -0,0 +1,24 @@
+diff -ur root-5.34.13.orig/config/Makefile.in root-5.34.13/config/Makefile.in
+--- root-5.34.13.orig/config/Makefile.in 2013-12-01 11:58:21.000000000 +0100
++++ root-5.34.13/config/Makefile.in 2013-12-04 14:50:39.291637133 +0100
+@@ -224,7 +224,7 @@
+ FPYTHIA6CPPFLAGS := @pythia6cppflags@
+
+ BUILDFPYTHIA8 := @buildpythia8@
+-FPYTHIA8INCDIR := @pythia8incdir@
++FPYTHIA8INCDIR := $(filter-out /usr/include, @pythia8incdir@)
+ FPYTHIA8LIBDIR := @pythia8libdir@
+ FPYTHIA8LIB := @pythia8lib@
+
+diff -ur root-5.34.13.orig/montecarlo/pythia8/Module.mk root-5.34.13/montecarlo/pythia8/Module.mk
+--- root-5.34.13.orig/montecarlo/pythia8/Module.mk 2013-12-01 11:58:21.000000000 +0100
++++ root-5.34.13/montecarlo/pythia8/Module.mk 2013-12-04 15:22:12.637030866 +0100
+@@ -50,7 +50,7 @@
+ $(PYTHIA8DS): $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP)
+ $(MAKEDIR)
+ @echo "Generating dictionary $@..."
+- $(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L)
++ $(ROOTCINTTMP) -f $@ -c $(FPYTHIA8INCDIR:%=-I%) $(PYTHIA8H) $(PYTHIA8L)
+
+ $(PYTHIA8MAP): $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L)
+ $(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \
diff --git a/root-unuran.patch b/root-unuran.patch
index b051e6e..e0557e5 100644
--- a/root-unuran.patch
+++ b/root-unuran.patch
@@ -1,16 +1,16 @@
-diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
---- root-trunk.orig/math/unuran/Module.mk 2010-11-25 20:41:32.000000000 +0100
-+++ root-trunk/math/unuran/Module.mk 2010-11-25 20:51:47.190704977 +0100
-@@ -20,7 +20,7 @@
- UNURANETAG := $(call stripsrc,$(UNURANDIRS)/headers.d)
- UNRCFG := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h)
-
+diff -ur root-5.34.13.orig/math/unuran/Module.mk root-5.34.13/math/unuran/Module.mk
+--- root-5.34.13.orig/math/unuran/Module.mk 2013-12-01 11:58:21.000000000 +0100
++++ root-5.34.13/math/unuran/Module.mk 2013-12-03 20:11:58.916479324 +0100
+@@ -31,7 +31,7 @@
+ $(wildcard $(UNRDIRS)/src/uniform/*.c) \
+ $(wildcard $(UNRDIRS)/src/urng/*.c)
+ else
-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
+UNRTARCONTENT:=
UNRS := $(filter %.c, \
$(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
$(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -69,10 +69,9 @@
+@@ -81,10 +81,9 @@
##### local rules #####
.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
@@ -22,7 +22,7 @@ diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk
$(UNRS): $(UNURANETAG)
$(UNURANETAG): $(UNRSRCS)
-@@ -125,12 +124,12 @@
+@@ -137,12 +136,12 @@
GNUMAKE=$(MAKE) ./configure CC="$$ACC" \
CFLAGS="$$ACFLAGS");
diff --git a/root.spec b/root.spec
index 52525a7..d1aaa53 100644
--- a/root.spec
+++ b/root.spec
@@ -42,9 +42,9 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: root
-Version: 5.34.10
+Version: 5.34.13
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
Group: Applications/Engineering
@@ -84,6 +84,10 @@ Patch6: %{name}-thtml-revert.patch
Patch7: %{name}-no-extra-formats.patch
# Fixes for HDFS module
Patch8: %{name}-hdfs.patch
+# Don't link to libjvm (handled properly inside libhdfs)
+Patch9: %{name}-dont-link-jvm.patch
+# Filter out /usr/include
+Patch10: %{name}-pythia8-incdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The build segfaults on ppc64 during an invocation of cint:
# https://savannah.cern.ch/bugs/index.php?70542
@@ -154,7 +158,6 @@ BuildRequires: srm-ifce-devel
%endif
%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
BuildRequires: hadoop-devel
-BuildRequires: java-devel
%endif
BuildRequires: emacs
BuildRequires: emacs-el
@@ -165,7 +168,7 @@ BuildRequires: graphviz-gd
%endif
BuildRequires: expat-devel
%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
-BuildRequires: pythia8-devel
+BuildRequires: pythia8-devel >= 8.1.80
%endif
%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: font(liberationsans)
@@ -1160,6 +1163,8 @@ fi
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
-name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -1242,7 +1247,6 @@ sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
unset QTDIR
unset QTLIB
unset QTINC
-export JAVA_HOME=/usr/lib/jvm/java
./configure --prefix=%{_prefix} \
--libdir=%{_libdir}/%{name} \
--etcdir=%{_datadir}/%{name} \
@@ -1281,7 +1285,6 @@ export JAVA_HOME=/usr/lib/jvm/java
%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
--enable-hdfs \
--with-hdfs-incdir=%{_includedir}/hadoop \
- --with-hdfs-libdir=%{_libdir} \
%else
--disable-hdfs \
%endif
@@ -1297,7 +1300,6 @@ export JAVA_HOME=/usr/lib/jvm/java
--enable-python \
%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
--enable-pythia8 \
- --with-pythia8-incdir=%{_includedir}/pythia8 \
%else
--disable-pythia8 \
%endif
@@ -1342,6 +1344,7 @@ export JAVA_HOME=/usr/lib/jvm/java
--disable-cling \
--disable-cxx11 \
--disable-glite \
+ --disable-libcxx \
--disable-monalisa \
--disable-oracle \
--disable-pythia6 \
@@ -1357,11 +1360,13 @@ make OPTFLAGS="%{optflags}" \
# Build PyROOT for python 2.6
mkdir pyroot26
cp bindings/pyroot26/ROOT.py pyroot26
+cp bindings/pyroot26/cppyy.py pyroot26
make OPTFLAGS="%{optflags}" \
EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
MODULES="build cint/cint core/utils bindings/pyroot26" \
PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
- PYROOTLIB=pyroot26/libPyROOT.so ROOTPY=pyroot26/ROOT.py
+ PYROOTLIB=pyroot26/libPyROOT.so \
+ ROOTPY="pyroot26/ROOT.py pyroot26/cppyy.py"
%endif
%install
@@ -1434,6 +1439,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{python26_sitearch}
install pyroot26/libPyROOT.so.%{libversion} \
${RPM_BUILD_ROOT}%{python26_sitearch}/libPyROOT.so
install -m 644 pyroot26/ROOT.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
+install -m 644 pyroot26/cppyy.py* ${RPM_BUILD_ROOT}%{python26_sitearch}
%endif
# Same for the Ruby interface library
@@ -1539,7 +1545,7 @@ echo Cint.Includes: 0 >> .rootrc
echo Root.StacktraceScript: ${PWD}/etc/gdb-backtrace.sh >> .rootrc
echo Gui.MimeTypeFile: ${PWD}/etc/root.mimes >> .rootrc
sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
-LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl:/usr/lib/jvm/jre/lib/amd64/server:/usr/lib/jvm/jre/lib/i386/server \
+LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
rm .rootrc
mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
@@ -1973,6 +1979,7 @@ fi
%endif
%{python_sitearch}/libPyROOT.*
%{python_sitearch}/ROOT.py*
+%{python_sitearch}/cppyy.py*
%if "%{?rhel}" == "5"
%files python26 -f includelist-bindings-pyroot
@@ -1983,6 +1990,7 @@ fi
%ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
%{python26_sitearch}/libPyROOT.*
%{python26_sitearch}/ROOT.py*
+%{python26_sitearch}/cppyy.py*
%endif
%files ruby -f includelist-bindings-ruby
@@ -2477,6 +2485,11 @@ fi
%{emacs_lispdir}/root/*.el
%changelog
+* Tue Dec 03 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.13-1
+- Update to 5.34.13
+- Remove java-devel build dependency (not needed with Fedora's libhdfs)
+- Adapt to pythia8 >= 8.1.80
+
* Mon Nov 25 2013 Orion Poplawski <orion at cora.nwra.com> - 5.34.10-3
- Fix hadoop lib location
diff --git a/sources b/sources
index 8a18003..0d3741f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-144ea7c3f9b3aea96445701956e3bc81 root-5.34.10.tar.xz
+0d4538ebd29542d4bb0ae48922ae54a8 root-5.34.13.tar.xz
More information about the scm-commits
mailing list