1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
diff -aur root-old/cint/cint/Module.mk root-new/cint/cint/Module.mk
--- root-old/cint/cint/Module.mk 2017-06-01 16:13:51.675539292 +0200
+++ root-new/cint/cint/Module.mk 2017-06-01 17:50:36.210716745 +0200
@@ -165,6 +165,14 @@
CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
CINTS2 += $(MODDIRSD)/gcc4strm.cxx
endif
+ifeq ($(GCC_MAJOR),6)
+CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
+CINTS2 += $(MODDIRSD)/gcc4strm.cxx
+endif
+ifeq ($(GCC_MAJOR),7)
+CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
+CINTS2 += $(MODDIRSD)/gcc4strm.cxx
+endif
ifneq ($(CLANG_MAJOR),)
CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
CINTS2 += $(MODDIRSD)/gcc4strm.cxx
@@ -207,6 +215,12 @@
ifneq ($(CLANG_MAJOR),)
IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
else
+ifeq ($(GCC_MAJOR),7)
+IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
+else
+ifeq ($(GCC_MAJOR),6)
+IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
+else
ifeq ($(GCC_MAJOR),5)
IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
else
@@ -221,6 +235,8 @@
endif
endif
endif
+endif
+endif
# used in the main Makefile
ALLHDRS += $(CINTHT) $(CINTINCLUDES)
@@ -305,7 +321,7 @@
$(MAKECINT): $(MAKECINTO)
$(LD) $(LDFLAGS) -o $@ $(MAKECINTO)
-$(IOSENUM):
+$(IOSENUM):
$(MAKEDIR)
@(if [ ! -r $(IOSENUMA) ]; then \
echo "Missing $(IOSENUMA), run: make $(IOSENUMA)"; \
@@ -355,7 +371,12 @@
ifeq ($(GCC_MAJOR),5)
$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
endif
-
+ifeq ($(GCC_MAJOR),6)
+$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
+endif
+ifeq ($(GCC_MAJOR),7)
+$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
+endif
$(MAKECINTO) $(CINTO): $(CINTCONF) $(ORDER_) $(CINTINCLUDES)
@@ -389,8 +410,16 @@
##### configcint.h
ifeq ($(CPPPREP),)
# cannot use "CPPPREP?=", as someone might set "CPPPREP="
+ifeq ($(GCC_MAJOR),7)
+ CPPPREP = $(CXX) -std=c++98 -E -C
+else
+ifeq ($(GCC_MAJOR),6)
+ CPPPREP = $(CXX) -std=c++98 -E -C
+else
CPPPREP = $(CXX) -E -C
endif
+endif
+endif
include $(CINTCONFMK)
##### configcint.h - END
diff -aur root-old/cmake/modules/SetUpLinux.cmake root-new/cmake/modules/SetUpLinux.cmake
--- root-old/cmake/modules/SetUpLinux.cmake 2017-06-01 16:13:46.998827283 +0200
+++ root-new/cmake/modules/SetUpLinux.cmake 2017-06-01 17:46:27.478632487 +0200
@@ -69,7 +69,11 @@
set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
#Settings for cint
- set(CPPPREP "${CXX} -E -C")
+ if (GCC_MAJOR GREATER 5)
+ set(CPPPREP "${CXX} -std=c++98 -E -C")
+ else()
+ set(CPPPREP "${CXX} -E -C")
+ endif()
set(CXXOUT "-o ")
set(EXPLICITLINK "no") #TODO
diff -aur root-old/config/Makefile.linux root-new/config/Makefile.linux
--- root-old/config/Makefile.linux 2017-06-01 16:14:00.295622865 +0200
+++ root-new/config/Makefile.linux 2017-06-01 16:33:37.129379961 +0200
@@ -62,7 +62,6 @@
else
F77LIBS := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
endif
-F77LIBS += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
endif
ifneq ($(findstring g77, $(F77)),)
diff -aur root-old/config/Makefile.linuxx8664gcc root-new/config/Makefile.linuxx8664gcc
--- root-old/config/Makefile.linuxx8664gcc 2017-06-01 16:14:00.322289790 +0200
+++ root-new/config/Makefile.linuxx8664gcc 2017-06-01 16:33:37.129379961 +0200
@@ -71,7 +71,6 @@
else
F77LIBS := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
endif
-F77LIBS += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
endif
ifneq ($(findstring g77, $(F77)),)
|