diff -uNr src.orig/BASE_MapFile.cxx src/BASE_MapFile.cxx --- src.orig/BASE_MapFile.cxx Fri Mar 19 05:59:11 1999 +++ src/BASE_MapFile.cxx Sat Mar 27 02:50:35 1999 @@ -151,7 +151,7 @@ #include #include #if defined(R__HPUX) || defined (R__ALPHA) || defined (R__SOLARIS) || \ - defined(R__AIX) || defined(R__HIUX) || defined (R__MKLINUX) + defined(R__AIX) || defined(R__HIUX) union semun { int val; // value for SETVAL struct semid_ds *buf; // buffer for IPC_STAT & IPC_SET diff -uNr src.orig/BASE_Math.cxx src/BASE_Math.cxx --- src.orig/BASE_Math.cxx Fri Mar 19 05:59:11 1999 +++ src/BASE_Math.cxx Sat Mar 27 02:50:35 1999 @@ -46,7 +46,7 @@ //______________________________________________________________________________ #if (defined(sun) && !defined(R__I386) && !defined(__SunOS_5_6)) || \ - (defined(__OPTIMIZE__) && \ + (defined(__OPTIMIZE__) && !defined(R__MKLINUX) && \ (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7))) extern "C" void sincos(Double_t, Double_t*, Double_t*); #else diff -uNr src.orig/Make-macros src/Make-macros --- src.orig/Make-macros Fri Mar 19 06:05:47 1999 +++ src/Make-macros Sat Mar 27 02:50:44 1999 @@ -1077,7 +1077,8 @@ $(X11TTFLIB): $(X11TTFO) $(X11TTFDO) @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ "$(X11TTFO) $(X11TTFDO)" + "$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ \ + "$(X11TTFO) $(X11TTFDO) -lttf -ldl" $(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINT) @echo "Generating dictionary $(X11TTFDS)..." diff -uNr src.orig/Makefile.mklinux src/Makefile.mklinux --- src.orig/Makefile.mklinux Fri Mar 19 06:05:47 1999 +++ src/Makefile.mklinux Sat Mar 27 02:50:35 1999 @@ -4,11 +4,13 @@ CXX = g++ CC = gcc -CXXFLAGS = -Wall -fsigned-char -fPIC -DR__GLIBC \ +CXXFLAGS = -Wall -fsigned-char -fno-rtti -fno-exceptions \ + -fPIC -DR__GLIBC \ -I/usr/X11/include/ -I/usr/include/g++/ CFLAGS = -Wall -fPIC -fsigned-char -DR__GLIBC \ -I/usr/X11/include/ -I/usr/include/g++/ -CINTCXXFLAGS = -Wall -fPIC -fsigned-char -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ +CINTCXXFLAGS = -Wall -fPIC -fsigned-char -fno-rtti -fno-exceptions \ + -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \ -I/usr/include/g++/ CINTCFLAGS = -Wall -fPIC -fsigned-char -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ @@ -16,15 +18,16 @@ OPT = -O2 NOOPT = LD = g++ -LDFLAGS = $(OPT) +LDFLAGS = $(OPT) -rdynamic SOFLAGS = -shared -Wl,-soname, SOEXT = so -SYSLIBS = -lg++ -lm -ldl -SYSXLIBS = -L/usr/X11R6/lib -lX11 -lSM -lICE -lg++ -lm -ldl -XLIBS = -L/usr/X11R6/lib -lX11 -lSM -lICE -lXpm -lg++ -CILIBS = -lm -ltermcap -lbsd -ldl -lg++ - +SYSLIBS = -lm -ldl +SYSXLIBS = -L/usr/X11R6/lib -lX11 -lSM -lICE -lm -ldl +XLIBS = -L/usr/X11R6/lib -lX11 -lSM -lICE -lXpm +CILIBS = -lm -ltermcap -lbsd -ldl +CRYPTLIBS = -lcrypt +F77LIBS = -lg2c ##### MACROS and TARGETS ##### diff -uNr src.orig/ROOTD_daemon.cxx src/ROOTD_daemon.cxx --- src.orig/ROOTD_daemon.cxx Sat Mar 20 05:59:04 1999 +++ src/ROOTD_daemon.cxx Sat Mar 27 02:50:35 1999 @@ -51,6 +51,10 @@ #define SIGCLD SIGCHLD #endif +#if defined(__linux) && defined(__powerpc) +#define SIGCLD SIGCHLD +#endif + #if defined(__linux) || defined(__hpux) || defined(__sun) || defined(__sgi) || \ defined(_AIX) || defined(__FreeBSD__) #define USE_SETSID diff -uNr src.orig/ROOTD_net.cxx src/ROOTD_net.cxx --- src.orig/ROOTD_net.cxx Sat Mar 20 05:59:04 1999 +++ src/ROOTD_net.cxx Sat Mar 27 02:50:35 1999 @@ -38,6 +38,10 @@ #include #include +#if defined(__linux) && defined(__powerpc) +#define socklen_t size_t +#endif + //*KEEP,rootdp,T=C++. #include "rootdp.h" //*KEND. diff -uNr src.orig/ROOTX_rootx.cxx src/ROOTX_rootx.cxx --- src.orig/ROOTX_rootx.cxx Fri Mar 19 06:05:26 1999 +++ src/ROOTX_rootx.cxx Sat Mar 27 02:50:35 1999 @@ -19,7 +19,6 @@ // (depending on the platform). // // // ////////////////////////////////////////////////////////////////////////// - #include #include #include @@ -49,6 +48,9 @@ extern "C" { # endif # include +# if defined(__linux) && defined(__powerpc) && (__GNUC_MINOR__ < 90) +} +# endif # define STRUCT_UTMP struct utmp # endif #endif diff -uNr src.orig/UNIX_UnixSystem.cxx src/UNIX_UnixSystem.cxx --- src.orig/UNIX_UnixSystem.cxx Fri Mar 19 05:59:16 1999 +++ src/UNIX_UnixSystem.cxx Sat Mar 27 02:50:35 1999 @@ -175,6 +175,9 @@ extern "C" { #endif #include +#if defined(R__MKLINUX) && !defined(R__PPCEGCS) +} +#endif #define STRUCT_UTMP struct utmp #endif #if !defined(UTMP_FILE) && defined(_PATH_UTMP) // 4.4BSD @@ -196,6 +199,10 @@ const char *kServerPath = "/tmp"; const char *kProtocolName = "tcp"; + +#if defined(R__MKLINUX) +#define socklen_t size_t +#endif //______________________________________________________________________________ diff -uNr src.orig/X3D_x3d.c src/X3D_x3d.c --- src.orig/X3D_x3d.c Fri Mar 19 05:59:16 1999 +++ src/X3D_x3d.c Sat Mar 27 02:50:52 1999 @@ -1053,9 +1053,15 @@ /* An 16 bit TrueColor ? */ +#if defined(__linux) +#define SIXTEEN 15 + + if(XMatchVisualInfo(g->dpy, screen, 15, TrueColor, &vInfo)){ +#else #define SIXTEEN 16 if(XMatchVisualInfo(g->dpy, screen, 16, TrueColor, &vInfo)){ +#endif g->depth = SIXTEEN; }else{