Skip to content
Snippets Groups Projects
Commit 291b66e2 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

several more changes for gcc v3 port on Debian and PPC.

git-svn-id: http://root.cern.ch/svn/root/trunk@2465 27541ba8-7e3a-0410-8455-c3a389f83636
parent 8bfcad28
No related branches found
No related tags found
No related merge requests found
/* @(#)root/base:$Name: $:$Id: RConfig.h,v 1.21 2001/05/11 17:13:09 rdm Exp $ */ /* @(#)root/base:$Name: $:$Id: RConfig.h,v 1.22 2001/06/25 12:54:32 rdm Exp $ */
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
# define R__LINUX # define R__LINUX
# define R__UNIX # define R__UNIX
# define NEED_SIGJMP # define NEED_SIGJMP
# if __GNUC_MINOR__ >= 90 /* egcs */ # if __GNUC__ >= 3 || __GNUC_MINOR__ >= 90 /* modern egcs/gcc */
# define R__PPCEGCS # define R__PPCEGCS
# endif # endif
#endif #endif
......
...@@ -14,11 +14,22 @@ CINTDIRM := $(CINTDIR)/main ...@@ -14,11 +14,22 @@ CINTDIRM := $(CINTDIR)/main
CINTDIRT := $(CINTDIR)/tool CINTDIRT := $(CINTDIR)/tool
CINTDIRL := $(CINTDIR)/lib CINTDIRL := $(CINTDIR)/lib
##### check for gcc v3 #####
ifeq ($(CXX),g++)
GCCVERS := $(shell $(CXX) -v 2>&1 | \
awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
endif
##### libCint ##### ##### libCint #####
CINTH := $(wildcard $(MODDIRI)/*.h) CINTH := $(wildcard $(MODDIRI)/*.h)
CINTS1 := $(wildcard $(MODDIRS)/*.c) CINTS1 := $(wildcard $(MODDIRS)/*.c)
CINTS2 := $(wildcard $(MODDIRS)/*.cxx) CINTS2 := $(wildcard $(MODDIRS)/*.cxx)
CINTS1 += $(CINTDIRM)/G__setup.c
CINTALLO := $(CINTS1:.c=.o) $(CINTS2:.cxx=.o)
CINTALLDEP := $(CINTALLO:.o=.d)
CINTS1 := $(filter-out $(MODDIRS)/sunos.%,$(CINTS1)) CINTS1 := $(filter-out $(MODDIRS)/sunos.%,$(CINTS1))
CINTS1 := $(filter-out $(MODDIRS)/dlfcn.%,$(CINTS1)) CINTS1 := $(filter-out $(MODDIRS)/dlfcn.%,$(CINTS1))
CINTS1 := $(filter-out $(MODDIRS)/macos.%,$(CINTS1)) CINTS1 := $(filter-out $(MODDIRS)/macos.%,$(CINTS1))
...@@ -35,8 +46,6 @@ CINTS2 := $(filter-out $(MODDIRS)/bcstrm.%,$(CINTS2)) ...@@ -35,8 +46,6 @@ CINTS2 := $(filter-out $(MODDIRS)/bcstrm.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/vcstrmold.%,$(CINTS2)) CINTS2 := $(filter-out $(MODDIRS)/vcstrmold.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/Apiifold.%,$(CINTS2)) CINTS2 := $(filter-out $(MODDIRS)/Apiifold.%,$(CINTS2))
CINTS1 += $(CINTDIRM)/G__setup.c
ifeq ($(CXX),KCC) ifeq ($(CXX),KCC)
CINTS2 += $(MODDIRS)/kccstrm.cxx CINTS2 += $(MODDIRS)/kccstrm.cxx
else else
...@@ -171,12 +180,12 @@ $(IOSENUMA): $(CINTTMP) $(MAKEINFO) ...@@ -171,12 +180,12 @@ $(IOSENUMA): $(CINTTMP) $(MAKEINFO)
all-cint: $(CINTLIB) $(CINT) $(CINTTMP) $(MAKECINT) $(IOSENUM) all-cint: $(CINTLIB) $(CINT) $(CINTTMP) $(MAKECINT) $(IOSENUM)
clean-cint: clean-cint:
@rm -f $(CINTTMPO) $(CINTO) $(CINTEXEO) $(MAKECINTO) @rm -f $(CINTTMPO) $(CINTALLO) $(CINTEXEO) $(MAKECINTO)
clean:: clean-cint clean:: clean-cint
distclean-cint: clean-cint distclean-cint: clean-cint
@rm -f $(CINTDEP) $(CINTLIB) $(IOSENUM) $(CINTEXEDEP) \ @rm -f $(CINTALLDEP) $(CINTLIB) $(IOSENUM) $(CINTEXEDEP) \
$(CINT) $(CINTTMP) $(MAKECINT) $(CINT) $(CINTTMP) $(MAKECINT)
distclean:: distclean-cint distclean:: distclean-cint
......
...@@ -21,8 +21,6 @@ CINTCXXFLAGS = -pipe -Wall -Woverloaded-virtual -fPIC $(EXTRA_CXXFLAGS) \ ...@@ -21,8 +21,6 @@ CINTCXXFLAGS = -pipe -Wall -Woverloaded-virtual -fPIC $(EXTRA_CXXFLAGS) \
CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \ CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
GCCVERS := $(shell $(CXX) -v 2>&1 | \
awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
# Linker: # Linker:
LD = g++ LD = g++
......
...@@ -21,8 +21,6 @@ CINTCXXFLAGS = -pipe -Wall -fPIC $(EXTRA_CXXFLAGS) \ ...@@ -21,8 +21,6 @@ CINTCXXFLAGS = -pipe -Wall -fPIC $(EXTRA_CXXFLAGS) \
CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \ CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__64BIT -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__64BIT
GCCVERS := $(shell $(CXX) -v 2>&1 | \
awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
# Linker: # Linker:
LD = g++ LD = g++
......
// @(#)root/rootx:$Name: $:$Id: rootx.cxx,v 1.5 2001/04/06 14:17:42 rdm Exp $ // @(#)root/rootx:$Name: $:$Id: rootx.cxx,v 1.6 2001/06/22 16:10:21 rdm Exp $
// Author: Fons Rademakers 19/02/98 // Author: Fons Rademakers 19/02/98
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
# include <utmpx.h> # include <utmpx.h>
# define STRUCT_UTMP struct utmpx # define STRUCT_UTMP struct utmpx
# else # else
# if defined(__linux) && defined(__powerpc) && (__GNUC_MINOR__ < 90) # if defined(__linux) && defined(__powerpc) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 90)
extern "C" { extern "C" {
# endif # endif
# include <utmp.h> # include <utmp.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment