From 291b66e2c7d75fe0999a1423a6341a3f0dc41e01 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Tue, 26 Jun 2001 16:32:36 +0000
Subject: [PATCH] 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
---
base/inc/RConfig.h | 4 ++--
cint/Module.mk | 17 +++++++++++++----
config/Makefile.linuxegcs | 2 --
config/Makefile.linuxia64gcc | 2 --
rootx/src/rootx.cxx | 4 ++--
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/base/inc/RConfig.h b/base/inc/RConfig.h
index 7cb2927ddd2..f785b7aa323 100644
--- a/base/inc/RConfig.h
+++ b/base/inc/RConfig.h
@@ -1,4 +1,4 @@
-/* @(#)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. *
@@ -174,7 +174,7 @@
# define R__LINUX
# define R__UNIX
# define NEED_SIGJMP
-# if __GNUC_MINOR__ >= 90 /* egcs */
+# if __GNUC__ >= 3 || __GNUC_MINOR__ >= 90 /* modern egcs/gcc */
# define R__PPCEGCS
# endif
#endif
diff --git a/cint/Module.mk b/cint/Module.mk
index f51b210348b..f3874dd7595 100644
--- a/cint/Module.mk
+++ b/cint/Module.mk
@@ -14,11 +14,22 @@ CINTDIRM := $(CINTDIR)/main
CINTDIRT := $(CINTDIR)/tool
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 #####
CINTH := $(wildcard $(MODDIRI)/*.h)
CINTS1 := $(wildcard $(MODDIRS)/*.c)
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)/dlfcn.%,$(CINTS1))
CINTS1 := $(filter-out $(MODDIRS)/macos.%,$(CINTS1))
@@ -35,8 +46,6 @@ CINTS2 := $(filter-out $(MODDIRS)/bcstrm.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/vcstrmold.%,$(CINTS2))
CINTS2 := $(filter-out $(MODDIRS)/Apiifold.%,$(CINTS2))
-CINTS1 += $(CINTDIRM)/G__setup.c
-
ifeq ($(CXX),KCC)
CINTS2 += $(MODDIRS)/kccstrm.cxx
else
@@ -171,12 +180,12 @@ $(IOSENUMA): $(CINTTMP) $(MAKEINFO)
all-cint: $(CINTLIB) $(CINT) $(CINTTMP) $(MAKECINT) $(IOSENUM)
clean-cint:
- @rm -f $(CINTTMPO) $(CINTO) $(CINTEXEO) $(MAKECINTO)
+ @rm -f $(CINTTMPO) $(CINTALLO) $(CINTEXEO) $(MAKECINTO)
clean:: clean-cint
distclean-cint: clean-cint
- @rm -f $(CINTDEP) $(CINTLIB) $(IOSENUM) $(CINTEXEDEP) \
+ @rm -f $(CINTALLDEP) $(CINTLIB) $(IOSENUM) $(CINTEXEDEP) \
$(CINT) $(CINTTMP) $(MAKECINT)
distclean:: distclean-cint
diff --git a/config/Makefile.linuxegcs b/config/Makefile.linuxegcs
index 80b74629eef..f454a1e60a9 100644
--- a/config/Makefile.linuxegcs
+++ b/config/Makefile.linuxegcs
@@ -21,8 +21,6 @@ CINTCXXFLAGS = -pipe -Wall -Woverloaded-virtual -fPIC $(EXTRA_CXXFLAGS) \
CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
-GCCVERS := $(shell $(CXX) -v 2>&1 | \
- awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
# Linker:
LD = g++
diff --git a/config/Makefile.linuxia64gcc b/config/Makefile.linuxia64gcc
index b505f2f4fa0..02f1248ab28 100644
--- a/config/Makefile.linuxia64gcc
+++ b/config/Makefile.linuxia64gcc
@@ -21,8 +21,6 @@ CINTCXXFLAGS = -pipe -Wall -fPIC $(EXTRA_CXXFLAGS) \
CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__64BIT
-GCCVERS := $(shell $(CXX) -v 2>&1 | \
- awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
# Linker:
LD = g++
diff --git a/rootx/src/rootx.cxx b/rootx/src/rootx.cxx
index af2edffe175..7241d8c1139 100644
--- a/rootx/src/rootx.cxx
+++ b/rootx/src/rootx.cxx
@@ -1,4 +1,4 @@
-// @(#)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
//////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@
# include <utmpx.h>
# define STRUCT_UTMP struct utmpx
# else
-# if defined(__linux) && defined(__powerpc) && (__GNUC_MINOR__ < 90)
+# if defined(__linux) && defined(__powerpc) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 90)
extern "C" {
# endif
# include <utmp.h>
--
GitLab