Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version bump in 5.32 and 5.34 branches.
- Loading branch information
Showing
11 changed files
with
1,054 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| DIST ROOTUsersGuide-5.34.02.pdf 9137216 SHA256 b69908af895804e824470078fa32974974a492d8e5db81c2f4b67c68b091c98d SHA512 874316975b28a820badd3c116238005870d4bf559b0c86349293ee9bdc2d0fedc763658ff5f03b8ef4565ecbee9a014de55472c126c4b94b97cb3b103b9c5968 WHIRLPOOL ffc66e18396334e44566be1609177b9e9dab5ea7c72be0ac0ec1fb9aea528a53ce3a8be397ada15e805a43d8edc2293e5f1b1ef551ed3dc2a1619fdf0227e4f0 | ||
| DIST ROOTUsersGuide.pdf 9124822 SHA256 70a96c4a2573dc0d320142f86993ecfda24caa755e910340a3014120f2997c8b SHA512 c3b4c18ef2e13968afdf67c6003249d4cfe6ea661fa32ce25127361bae7e3376a25cd3b11591292f3975bcd8105291aca52f2f6214c9fe45f4bd6e7e44d54b25 WHIRLPOOL 11256ba7837d17e5795cf71ac32db43d7d8f797bfbddf5f71612fe2f8fb2e01354372c0ea8f0bc22868881eb0bfdc8a3e3f1b05293d2750d293aa4d59217b2e6 | ||
| DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b WHIRLPOOL 033897bef4bdb13246a81ea6749f7895e6c4d639752e932130234ad9153bb399a4e5d416237850da27f139d3cccc53d9adb7a077abf20d257ce057157d6c3696 | ||
| DIST TMVAUsersGuide-v4.03.pdf 3913533 SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af SHA512 d8bb2ce35ef32c4877059898f56513db0b1057924e21935a3d3a6f114748e167984c43fd2ec7e54197fccff875540543968fea9a8e75bf63f5f13521724a7ddb WHIRLPOOL 0a3e2e61e8e32f3a22757178adf033f9fbb89014aecd4df7f8bd49677d772bb3ad2c0f5526259611879f6bb20df647c01e23f53ade483d7a3e2242f8aee6c6aa | ||
| DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac | ||
| DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f WHIRLPOOL dd23e26acf9303b404cda8135d6946af3b1abba3dfdff8d80e56096f810d50a01ebfb52dc1e6ee1d1b99fbb5859dc850e0e368155339b5007294d95ce8909857 | ||
| DIST root_v5.32.04.source.tar.gz 55526502 SHA256 0c0130ba3d74b86caee3071deeceb46545cfde34def8ad2107601e133506acf2 SHA512 796d7f6fe92700232da3fcaac042438e13c13e504179a7375105b2ff06e1fac571ef4d59f270d73844b2a481b0762a873985d22eee2b1a0b156071b777d4417a WHIRLPOOL c5ce0f81331e08b3f79e97c894bff60185bba562388e789d3d1716d3523045a55c24e1cebded4ad19a09023c4b5275fd7d44acb726a1f248a9616ed95addd609 | ||
| DIST root_v5.34.02.source.tar.gz 56243895 SHA256 401ae3b69a397e0ab557faf640a13f49f8aab41dc03b4e7ebddbe37be32fedb1 SHA512 3f8da0e78e2be7a3961b97e6da0bc6957f74c51f4356a273a996a081b6ec9ce62311d89bd3aa3bbfcd3a7e47ea8324ebc6565eae40b72a9c85aa7a7c7b18fd79 WHIRLPOOL 1ca36f02a7f060f946b5c5a578fe8edf710da5bbc257dacd6dbbf513c95738e73da58915acb90322f38094a383b9cf34f24ea17f982da6ae8069abe25ab96cac | ||
| DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- root.orig/configure 2010-12-20 07:17:54.000000000 +0000 | ||
| +++ root/configure 2010-12-20 07:16:05.000000000 +0000 | ||
| @@ -709,7 +709,7 @@ | ||
| cat <<EOF > conftest.mk | ||
| include ${ac_srcdir}/config/Makefile.${arch} | ||
| conftest: conftest.c | ||
| - \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ | ||
| + \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ | ||
|
|
||
| conftest.c: | ||
| echo "int main() { return 0; }" > \$@ | ||
| @@ -723,7 +723,7 @@ | ||
| cat <<EOF > conftest.mk | ||
| include ${ac_srcdir}/config/Makefile.${arch} | ||
| conftest:conftest.c | ||
| - \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ | ||
| + \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ | ||
|
|
||
| conftest.c: | ||
| echo "extern int $linksymbol (); " > \$@ |
138 changes: 138 additions & 0 deletions
138
sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| diff -Naur root.orig/Makefile root/Makefile | ||
| --- root.orig/Makefile 2010-12-17 22:48:40.577775091 +0300 | ||
| +++ root/Makefile 2010-12-17 22:49:27.902497903 +0300 | ||
| @@ -1148,10 +1148,7 @@ | ||
| if test "x$(RFLX_GRFLXPY)" != "x"; then \ | ||
| rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ | ||
| fi; \ | ||
| - if test "x$(RFLX_GRFLXPYC)" != "x"; then \ | ||
| - rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ | ||
| - fi; \ | ||
| - if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ | ||
| + if test "x$(RFLX_GRFLXPY)" != "x"; then \ | ||
| dir=$(RFLX_GRFLXDD:lib/=); \ | ||
| while test "x$${dir}" != "x" && \ | ||
| test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ | ||
| diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk | ||
| --- root.orig/bindings/pyroot/Module.mk 2010-12-17 22:48:39.941179413 +0300 | ||
| +++ root/bindings/pyroot/Module.mk 2010-12-17 22:49:27.899164943 +0300 | ||
| @@ -48,8 +48,6 @@ | ||
| ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) | ||
| $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ | ||
| endif | ||
| -ROOTPYC := $(ROOTPY:.py=.pyc) | ||
| -ROOTPYO := $(ROOTPY:.py=.pyo) | ||
|
|
||
| # used in the main Makefile | ||
| ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) | ||
| @@ -68,10 +66,8 @@ | ||
| include/%.h: $(PYROOTDIRI)/%.h | ||
| cp $< $@ | ||
|
|
||
| -%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' | ||
| -%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' | ||
|
|
||
| -$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ | ||
| +$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ | ||
| $(ROOTLIBSDEP) $(PYTHONLIBDEP) | ||
| @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ | ||
| "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ | ||
| @@ -113,7 +109,7 @@ | ||
|
|
||
| distclean-$(MODNAME): clean-$(MODNAME) | ||
| @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ | ||
| - $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ | ||
| + $(ROOTPY) $(PYROOTMAP) \ | ||
| $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) | ||
|
|
||
| distclean:: distclean-$(MODNAME) | ||
| diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules | ||
| --- root.orig/build/package/debian/rules 2010-12-17 22:48:40.197817461 +0300 | ||
| +++ root/build/package/debian/rules 2010-12-17 22:49:27.902497903 +0300 | ||
| @@ -623,10 +623,6 @@ | ||
| -X$(SYSCONFDIR)/root/system.rootauthrc \ | ||
| -X$(SYSCONFDIR)/root/system.rootdaemonrc \ | ||
| -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ | ||
| - -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ | ||
| - -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ | ||
| - -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ | ||
| - -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo | ||
| # $(foreach i, \ | ||
| # $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \ | ||
| # -X$(i:$(DTMP)/%=%) ) | ||
| diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk | ||
| --- root.orig/cint/cintex/Module.mk 2010-12-17 22:48:40.057833071 +0300 | ||
| +++ root/cint/cintex/Module.mk 2010-12-17 22:49:27.902497903 +0300 | ||
| @@ -31,10 +31,6 @@ | ||
| CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) | ||
| $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ | ||
| endif | ||
| -ifneq ($(BUILDPYTHON),no) | ||
| -CINTEXPYC := $(CINTEXPY:.py=.pyc) | ||
| -CINTEXPYO := $(CINTEXPY:.py=.pyo) | ||
| -endif | ||
|
|
||
| # used in the main Makefile | ||
| ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) | ||
| @@ -86,8 +82,6 @@ | ||
| fi) | ||
| cp $< $@ | ||
|
|
||
| -%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' | ||
| -%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' | ||
|
|
||
| $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ | ||
| $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) | ||
| diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk | ||
| --- root.orig/cint/reflex/Module.mk 2010-12-17 22:48:40.037835301 +0300 | ||
| +++ root/cint/reflex/Module.mk 2010-12-17 22:51:36.871451359 +0300 | ||
| @@ -48,9 +48,6 @@ | ||
| RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) | ||
| RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) | ||
| RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) | ||
| -ifneq ($(BUILDPYTHON),no) | ||
| -RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) | ||
| -endif | ||
|
|
||
| RFLX_LIBDIR = $(LIBDIR) | ||
|
|
||
| @@ -92,7 +89,7 @@ | ||
|
|
||
| ALLEXECS += $(RFLX_GENMAPX) | ||
|
|
||
| -POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) | ||
| +POSTBIN += $(RFLX_GRFLXPY) | ||
|
|
||
| ##### local rules ##### | ||
| .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ | ||
| @@ -122,8 +119,6 @@ | ||
| mkdir -p lib/python/genreflex; fi ) | ||
| cp $< $@ | ||
|
|
||
| -$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py | ||
| - @python -c 'import py_compile; py_compile.compile( "$<" )' | ||
|
|
||
| $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap | ||
|
|
||
| @@ -149,7 +144,7 @@ | ||
| $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ | ||
| -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) | ||
|
|
||
| -all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) | ||
| +all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) | ||
|
|
||
| clean-genreflex: | ||
| @rm -rf lib/python/genreflex | ||
| diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt | ||
| --- root.orig/cint/reflex/python/CMakeLists.txt 2010-12-17 22:48:40.037835301 +0300 | ||
| +++ root/cint/reflex/python/CMakeLists.txt 2010-12-17 22:49:27.902497903 +0300 | ||
| @@ -15,7 +15,7 @@ | ||
| ##################### sources #################### | ||
|
|
||
| FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) | ||
| -SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) | ||
| +SET(GENREFLEX_SCRIPT PARENT_SCOPE) | ||
|
|
||
| ##################### gccxmlpath #################### | ||
|
|
||
|
|
12 changes: 12 additions & 0 deletions
12
sci-physics/root/files/root-5.28.00h-explicit-functions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- root/io/io/Module.mk.orig 2011-11-24 20:12:56.000000000 +0400 | ||
| +++ root/io/io/Module.mk 2012-03-09 03:45:42.850549826 +0400 | ||
| @@ -67,9 +67,4 @@ | ||
| distclean:: distclean-$(MODNAME) | ||
|
|
||
| ##### extra rules ###### | ||
| -#ifeq ($(GCC_VERS_FULL),gcc-4.4.0) | ||
| -ifeq ($(GCC_VERS),gcc-4.4) | ||
| -ifneq ($(filter -O%,$(OPT)),) | ||
| $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION | ||
| -endif | ||
| -endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| --- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400 | ||
| +++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400 | ||
| @@ -625,7 +625,7 @@ | ||
| << "size=\"8,10\";" << endl | ||
| << "ratio=auto;" << endl | ||
| << "margin=0;" << endl | ||
| - << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl | ||
| + << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl | ||
| << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl; | ||
|
|
||
| std::stringstream ssDep; | ||
| @@ -704,7 +704,7 @@ | ||
| outdot << ";" << endl; | ||
| } else if (writeAndMoreFor) { | ||
| outdot << " \"...andmore" << writeAndMoreFor->GetName() | ||
| - << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl; | ||
| + << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl; | ||
| } | ||
| } | ||
| if (!levelExists) break; | ||
| @@ -733,7 +733,7 @@ | ||
| << "ranksep=0.1;" << endl | ||
| << "nodesep=0;" << endl | ||
| << "margin=0;" << endl; | ||
| - outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl; | ||
| + outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl; | ||
|
|
||
| std::stringstream ssDep; | ||
| const int numColumns = 3; | ||
| @@ -939,7 +939,7 @@ | ||
| << "ranksep=0;" << endl | ||
| << "nodesep=0;" << endl | ||
| << "size=\"8,10\";" << endl | ||
| - << "node [fontsize=20,shape=plaintext];" << endl; | ||
| + << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl; | ||
|
|
||
| for (std::list<std::string>::iterator iFile = listFilesToParse.begin(); | ||
| iFile != listFilesToParse.end(); ++iFile) { | ||
| @@ -999,7 +999,8 @@ | ||
| << "ranksep=0.7;" << endl | ||
| << "nodesep=0.3;" << endl | ||
| << "size=\"8,8\";" << endl | ||
| - << "ratio=compress;" << endl; | ||
| + << "ratio=compress;" << endl | ||
| + << "node [fontname=\"DejaVu Serif\"];" << endl; | ||
|
|
||
| TString libs(fCurrentClass->GetSharedLibs()); | ||
| outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl; | ||
| @@ -1109,7 +1110,8 @@ | ||
|
|
||
| dotout << "digraph G {" << endl | ||
| << "ratio=auto;" << endl | ||
| - << "rankdir=RL;" << endl; | ||
| + << "rankdir=RL;" << endl | ||
| + << "node [fontname=\"DejaVu Serif\"];" << endl; | ||
|
|
||
| // loop on all classes | ||
| TClassDocInfo* cdi = 0; |
18 changes: 18 additions & 0 deletions
18
sci-physics/root/files/root-5.32.00-explicit-functions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- root/io/io/Module.mk.orig 2012-02-29 19:46:38.000000000 +0400 | ||
| +++ root/io/io/Module.mk 2012-03-09 02:29:19.905665572 +0400 | ||
| @@ -67,15 +67,5 @@ | ||
| distclean:: distclean-$(MODNAME) | ||
|
|
||
| ##### extra rules ###### | ||
| -#ifeq ($(GCC_VERS_FULL),gcc-4.4.0) | ||
| -ifeq ($(GCC_VERS),gcc-4.4) | ||
| -ifneq ($(filter -O%,$(OPT)),) | ||
| $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION | ||
| -endif | ||
| -endif | ||
| -ifeq ($(GCC_VERS),gcc-4.5) | ||
| -ifneq ($(filter -O%,$(OPT)),) | ||
| $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION | ||
| -endif | ||
| -endif | ||
| - |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff -ur root-5.34.00.orig/build/rmkdepend/main.c root-5.34.00/build/rmkdepend/main.c | ||
| --- root-5.34.00.orig/build/rmkdepend/main.c 2012-06-05 15:31:46.000000000 +0200 | ||
| +++ root-5.34.00/build/rmkdepend/main.c 2012-07-05 20:42:58.938953353 +0200 | ||
| @@ -60,7 +60,7 @@ | ||
| # endif | ||
| # elif defined(__CYGWIN__) | ||
| extern int fchmod(int, mode_t); | ||
| -#else | ||
| +# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16) | ||
| extern int fchmod(int, int); | ||
| # endif | ||
| #endif | ||
| diff -ur root-5.34.00.orig/cint/tool/rmkdepend/main.c root-5.34.00/cint/tool/rmkdepend/main.c | ||
| --- root-5.34.00.orig/cint/tool/rmkdepend/main.c 2012-06-05 15:31:30.000000000 +0200 | ||
| +++ root-5.34.00/cint/tool/rmkdepend/main.c 2012-07-05 20:42:58.492949104 +0200 | ||
| @@ -58,7 +58,7 @@ | ||
| #if !defined(MAC_OS_X_VERSION_10_4) | ||
| extern int fchmod(); | ||
| #endif | ||
| -#else | ||
| +#elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16) | ||
| extern int fchmod(); | ||
| #endif | ||
| #endif | ||
| diff -ur root-5.34.00.orig/core/unix/src/TUnixSystem.cxx root-5.34.00/core/unix/src/TUnixSystem.cxx | ||
| --- root-5.34.00.orig/core/unix/src/TUnixSystem.cxx 2012-06-05 15:31:17.000000000 +0200 | ||
| +++ root-5.34.00/core/unix/src/TUnixSystem.cxx 2012-07-05 20:29:29.969242837 +0200 | ||
| @@ -98,6 +98,7 @@ | ||
| #include <pwd.h> | ||
| #include <grp.h> | ||
| #include <errno.h> | ||
| +#include <sys/resource.h> | ||
| #include <sys/wait.h> | ||
| #include <time.h> | ||
| #include <sys/time.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.