From dcf271fa3c8de892d3349c5b85a3da4300dfc3a9 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: May 10 2016 11:29:26 +0000 Subject: Update to 6.06.04 - Drop patch root-no-hexfloat-const.patch - Add requires on gcc-c++ to root-cling --- diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch index 3b01f2d..d21a76e 100644 --- a/root-broken-cmake-config.patch +++ b/root-broken-cmake-config.patch @@ -84,18 +84,6 @@ diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modu find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native) set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR}) -diff -Nur root-6.06.02.orig/cmake/modules/FindOCC.cmake root-6.06.02/cmake/modules/FindOCC.cmake ---- root-6.06.02.orig/cmake/modules/FindOCC.cmake 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/cmake/modules/FindOCC.cmake 2016-03-20 17:08:52.184461642 +0100 -@@ -11,7 +11,7 @@ - - find_path(OCC_INCLUDE_DIR - NAMES Standard_Real.hxx -- HINTS ${_occdirs} /usr/include/opencascade -+ HINTS ${_occdirs} /usr/include/opencascade /usr/include/oce - PATH_SUFFIXES inc - DOC "Specify the directory containing Standard_Real.hxx") - diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake --- root-6.06.02.orig/cmake/modules/FindPCRE.cmake 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/cmake/modules/FindPCRE.cmake 2016-03-20 17:08:52.184461642 +0100 diff --git a/root-missing-cmake-config.patch b/root-missing-cmake-config.patch index cfc6a3b..48085d6 100644 --- a/root-missing-cmake-config.patch +++ b/root-missing-cmake-config.patch @@ -18,7 +18,7 @@ diff -Nur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/c --- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/cmake/modules/RootConfiguration.cmake 2016-04-04 13:15:41.491400432 +0200 @@ -404,7 +404,13 @@ - set(dicttype ${ROOT_DICTTYPE}) + set(perl ${PERL_EXECUTABLE}) #---RConfigure------------------------------------------------------------------------------------------------- -set(setresuid undef) diff --git a/root-no-hexfloat-const.patch b/root-no-hexfloat-const.patch deleted file mode 100644 index e92ed6e..0000000 --- a/root-no-hexfloat-const.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur root-6.06.02.orig/math/mathcore/src/mixmax.h root-6.06.02/math/mathcore/src/mixmax.h ---- root-6.06.02.orig/math/mathcore/src/mixmax.h 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/math/mathcore/src/mixmax.h 2016-04-05 23:27:14.026856518 +0200 -@@ -134,7 +134,7 @@ - #define MOD_REM(k) ((k) % MERSBASE ) // latest Intel CPU is supposed to do this in one CPU cycle, but on my machines it seems to be 20% slower than the best tricks - #define MOD_MERSENNE(k) MOD_PAYNE(k) - --#define INV_MERSBASE (0x1p-61) -+#define INV_MERSBASE (4.336808689942017736029811203479766845703125e-19) // (0x1p-61) - - - // the charpoly is irreducible for the combinations of N and SPECIAL and has maximal period for N=508, 256, half period for 1260, and 1/12 period for 3150 diff --git a/root-test-install.patch b/root-test-install.patch index e9ddc87..5b3afb4 100644 --- a/root-test-install.patch +++ b/root-test-install.patch @@ -482,6 +482,29 @@ diff -Nur root-6.06.02.orig/core/base/src/TPluginManager.cxx root-6.06.02/core/b diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/TROOT.cxx --- root-6.06.02.orig/core/base/src/TROOT.cxx 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/core/base/src/TROOT.cxx 2016-03-20 14:37:23.735597777 +0100 +@@ -543,6 +543,22 @@ TROOT::TROOT(const char *name, const char *title, VoidFuncPtr_t *initfunc) + // Initialize Operating System interface + InitSystem(); + ++ // Initialize static directory functions ++ GetRootSys(); ++ GetBinDir(); ++ GetLibDir(); ++ GetIncludeDir(); ++ GetEtcDir(); ++ GetDataDir(); ++ GetDocDir(); ++ GetMacroDir(); ++ GetTutorialsDir(); ++ GetSourceDir(); ++ GetIconPath(); ++ GetTTFFontDir(); ++ ++ gRootDir = GetRootSys().Data(); ++ + TDirectory::Build(); + + // Initialize interface to CINT C++ interpreter @@ -1722,21 +1722,9 @@ "after the call to TROOT::InitInterpreter()!"); } @@ -550,20 +573,14 @@ diff -Nur root-6.06.02.orig/core/base/src/TROOT.cxx root-6.06.02/core/base/src/T #endif } -@@ -2521,14 +2486,258 @@ +@@ -2521,14 +2486,252 @@ } //////////////////////////////////////////////////////////////////////////////// + +#ifdef ROOTPREFIX +static Bool_t IgnorePrefix() { -+ static Bool_t ignorePrefix = kFALSE; -+ static Bool_t init = kFALSE; -+ if (!init) { -+ if (gSystem->Getenv("ROOTIGNOREPREFIX")) -+ ignorePrefix = kTRUE; -+ init = kTRUE; -+ } ++ static Bool_t ignorePrefix = gSystem->Getenv("ROOTIGNOREPREFIX"); + return ignorePrefix; +} +#endif @@ -1255,7 +1272,7 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix #endif // when libSystem.B.dylib is loaded we have finished loading all dylibs -@@ -600,13 +606,9 @@ +@@ -600,13 +606,8 @@ SetRootSys(); #endif @@ -1268,7 +1285,6 @@ diff -Nur root-6.06.02.orig/core/unix/src/TUnixSystem.cxx root-6.06.02/core/unix -#endif + // This is a fallback in case TROOT::GetRootSys() can't determine ROOTSYS + gRootDir = "/usr/local/root"; -+ gRootDir = TROOT::GetRootSys().Data(); return kFALSE; } @@ -1593,7 +1609,7 @@ diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/wi #endif UpdateRegistry(this, buf); -@@ -1112,23 +1099,19 @@ +@@ -1112,23 +1099,17 @@ fSigcnt = 0; @@ -1624,8 +1640,6 @@ diff -Nur root-6.06.02.orig/core/winnt/src/TWinNTSystem.cxx root-6.06.02/core/wi -#else - gRootDir= ROOTPREFIX; -#endif -+ -+ gRootDir = TROOT::GetRootSys().Data(); // Increase the accuracy of Sleep() without needing to link to winmm.lib typedef UINT (WINAPI* LPTIMEBEGINPERIOD)( UINT uPeriod ); diff --git a/root.spec b/root.spec index d1f0d6b..22e0d6d 100644 --- a/root.spec +++ b/root.spec @@ -24,9 +24,9 @@ %global _default_patch_flags --no-backup-if-mismatch Name: root -Version: 6.06.02 +Version: 6.06.04 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 2%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -78,8 +78,6 @@ Patch13: %{name}-fflags.patch Patch14: %{name}-unuran.patch # Use systme gl2ps Patch15: %{name}-gl2ps.patch -# Hex float constants are c++17 (can not use with c++11/c++14) -Patch16: %{name}-no-hexfloat-const.patch # Use the same soname for cmake and configure Patch17: %{name}-soname.patch # Save memory during build @@ -222,8 +220,10 @@ BuildRequires: OCE-devel BuildRequires: R-Rcpp-devel BuildRequires: R-RInside-devel BuildRequires: readline-devel +BuildRequires: tbb-devel BuildRequires: emacs BuildRequires: emacs-el +BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: graphviz-devel BuildRequires: expat-devel @@ -372,6 +372,7 @@ Requires: %{name}-io%{?_isa} = %{version}-%{release} # not work with the system libraries. The bundled llvm and # clang are compiled using -fvisibility=hidden, and are not # visible outside of the libCling module. +Requires: gcc-c++ Provides: bundled(clang-libs) Provides: bundled(llvm-libs) Obsoletes: %{name}-cint7 < 5.26.00c @@ -1553,7 +1554,6 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -1655,23 +1655,33 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -DCMAKE_INSTALL_ELISPDIR:PATH=%{_emacs_sitelispdir}/%{name} \ -Dgnuinstall:BOOL=ON \ -Dbuiltin_afterimage:BOOL=OFF \ - -Dbuiltin_ftgl:BOOL=OFF \ + -Dbuiltin_cfitsio:BOOL=OFF \ + -Dbuiltin_davix:BOOL=OFF \ + -Dbuiltin_fftw3:BOOL=OFF \ -Dbuiltin_freetype:BOOL=OFF \ + -Dbuiltin_ftgl:BOOL=OFF \ -Dbuiltin_gl2ps:BOOL=OFF \ -Dbuiltin_glew:BOOL=OFF \ + -Dbuiltin_gsl:BOOL=OFF \ + -Dbuiltin_llvm:BOOL=ON \ -Dbuiltin_lzma:BOOL=OFF \ + -Dbuiltin_openssl:BOOL=OFF \ -Dbuiltin_pcre:BOOL=OFF \ + -Dbuiltin_tbb:BOOL=OFF \ -Dbuiltin_unuran:BOOL=OFF \ + -Dbuiltin_xrootd:BOOL=OFF \ -Dbuiltin_zlib:BOOL=OFF \ -Dafdsmgrd:BOOL=OFF \ -Dafs:BOOL=OFF \ -Dalien:BOOL=OFF \ - -Dalloc:BOOL=OFF \ -Dasimage:BOOL=ON \ -Dastiff:BOOL=ON \ -Dbonjour:BOOL=ON \ -Dcastor:BOOL=OFF \ + -Dccache:BOOL=OFF \ -Dchirp:BOOL=OFF \ + -Dcling:BOOL=ON \ + -Dcocoa:BOOL=OFF \ %if %{?fedora}%{!?fedora:0} >= 24 -Dcxx14:BOOL=ON \ %else @@ -1679,9 +1689,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" %endif -Ddavix:BOOL=ON \ -Ddcache:BOOL=ON \ + -Dexceptions:BOOL=ON \ -Dexplicitlink:BOOL=ON \ -Dfftw3:BOOL=ON \ -Dfitsio:BOOL=ON \ + -Dfortran:BOOL=ON \ -Dgdml:BOOL=ON \ -Dgenvector:BOOL=ON \ %if %{oce} @@ -1692,7 +1704,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dgfal:BOOL=ON \ -Dglite:BOOL=OFF \ -Dglobus:BOOL=ON \ - -Dgsl-shared:BOOL=ON \ + -Dgsl_shared:BOOL=ON \ -Dgviz:BOOL=ON \ %if %{hadoop} -Dhdfs:BOOL=ON \ @@ -1700,6 +1712,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dhdfs:BOOL=OFF \ %endif -Dhttp:BOOL=ON \ + -Djemalloc:BOOL=OFF \ -Dkrb5:BOOL=ON \ -Dldap:BOOL=ON \ -Dlibcxx:BOOL=OFF \ @@ -1707,10 +1720,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dmemstat:BOOL=ON \ -Dminuit2:BOOL=ON \ -Dmonalisa:BOOL=OFF \ + -Dmt:BOOL=ON \ -Dmysql:BOOL=ON \ -Dodbc:BOOL=ON \ -Dopengl:BOOL=ON \ -Doracle:BOOL=OFF \ + -Dpch:BOOL=ON \ -Dpgsql:BOOL=ON \ -Dpythia6:BOOL=OFF \ %if %{pythia8} @@ -1724,6 +1739,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dr:BOOL=ON \ -Drfio:BOOL=ON \ -Droofit:BOOL=ON \ + -Droot7:BOOL=OFF \ -Drpath:BOOL=OFF \ %if %{ruby} -Druby:BOOL=ON \ @@ -1731,7 +1747,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Druby:BOOL=OFF \ %endif -Dsapdb:BOOL=OFF \ - -Dsearch-usrlocal:BOOL=OFF \ -Dshadowpw:BOOL=ON \ -Dshared:BOOL=ON \ -Dsoversion:BOOL=ON \ @@ -1739,11 +1754,13 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dsrp:BOOL=OFF \ -Dssl:BOOL=ON \ -Dtable:BOOL=ON \ + -Dtbb:BOOL=ON \ + -Dtcmalloc:BOOL=OFF \ + -Dthread:BOOL=ON \ -Dtmva:BOOL=ON \ -Dunuran:BOOL=ON \ -Dvc:BOOL=OFF \ -Dvdt:BOOL=ON \ - -Dwerror:BOOL=OFF \ -Dx11:BOOL=ON \ -Dxft:BOOL=ON \ -Dxml:BOOL=ON \ @@ -2988,6 +3005,11 @@ fi %{python_sitelib}/ROOTaaS %changelog +* Mon May 09 2016 Mattias Ellert - 6.06.04-1 +- Update to 6.06.04 +- Drop patch root-no-hexfloat-const.patch +- Add requires on gcc-c++ to root-cling + * Fri Apr 15 2016 Mattias Ellert - 6.06.02-2 - Rebuild for OCE-0.17.1 diff --git a/sources b/sources index 9fff1e1..8882937 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -efc971800c1ab365c309c02c4d1e0aeb root-6.06.02.tar.xz +f7d457dfc37fd560507efd47824010f1 root-6.06.04.tar.xz 7bb34ac86cae35a58bf226a22a328b9b root-testfiles.tar.xz