Fixes to Corba stuff

[Martin MOKREJŠ <mmokrejs natur cuni cz>]

Hi,
  I've tried to compile CORBA-ORBit-0.4.3 and GNOME-GNORBA-0.1.0 on
Tru64Unix 5.1A and I had some problems. As you know, the compiler or
preprocessor is somewhat buggy is not C99 compatible by default. I had to
change -std to -std1 to obey this problem. C++ comments like '//' aren't
allowed, so I had to fix these too. Also, -Wall option is for gcc
only, so I had to remove it too. Last, I needed -lX11 to link
GNOME-GNORBA-0.1.0. And lastly I'm fooled, why weren't my CFLAGS and
CPPFLAGS picked up properly at the "perl Makefile.PL" step.

I've seen milions of warnings, do you want to inspect them? Hope this
helps.

diff -r -u -w GNOME-GNORBA-0.1.0/Makefile GNOME-GNORBA-0.1.0-new/Makefile
--- GNOME-GNORBA-0.1.0/Makefile 2003-01-10 09:21:40.000000000 +0100
+++ GNOME-GNORBA-0.1.0-new/Makefile     2003-01-10 03:41:34.000000000 +0100
@@ -14,7 +14,7 @@
 #     INC => q[]
 #     LIBS => [q[]]
 #     NAME => q[GNOME::GNORBA]
-#     OPTIMIZE => q[-g -Wall]
+#     OPTIMIZE => q[-g ]
 #     VERSION_FROM => q[GNORBA.pm]

 # --- MakeMaker post_initialize section:
@@ -31,9 +31,9 @@
 CCDLFLAGS =
 DLEXT = none
 DLSRC = dl_none.xs
-LD = ld
-LDDLFLAGS =
-LDFLAGS =  -L/usr/local/lib
+LD = ld -L/usr/local/lib -lX11
+LDDLFLAGS =  -L/usr/local/lib -lX11
+LDFLAGS =  -L/usr/local/lib -lX11
 LIBC = /usr/shlib/libc.so
 LIB_EXT = .a
 OBJ_EXT = .o
@@ -271,7 +271,7 @@
 # --- MakeMaker cflags section:

 CCFLAGS = -pthread -std -D_INTRINSICS -fprm d -ieee -I/usr/local/include -DLANGUAGE_C
-OPTIMIZE = -g -Wall
+OPTIMIZE = -g
 PERLTYPE =
 MPOLLUTE =

diff -r -u -w GNOME-GNORBA-0.1.0/Makefile.PL GNOME-GNORBA-0.1.0-new/Makefile.PL
--- GNOME-GNORBA-0.1.0/Makefile.PL      2000-01-02 22:22:49.000000000 +0100
+++ GNOME-GNORBA-0.1.0-new/Makefile.PL  2003-01-10 03:39:20.000000000 +0100
@@ -21,6 +21,6 @@
     'INC'      => $cflags,
     'LIBS'     => [$libs],
     'DEFINE'   => '',
-    'OPTIMIZE'  => '-g -Wall',
+    'OPTIMIZE'  => '-g ',
     'INC'      => '',
 );






















diff -r -u -w CORBA-ORBit-0.4.3/Makefile CORBA-ORBit-0.4.3-new/Makefile
--- CORBA-ORBit-0.4.3/Makefile  2003-01-10 09:22:00.000000000 +0100
+++ CORBA-ORBit-0.4.3-new/Makefile      2003-01-10 03:37:28.000000000 +0100
@@ -16,7 +16,7 @@
 #     MAP_TARGET => q[orbitperl]
 #     NAME => q[CORBA::ORBit]
 #     OBJECT => q[ORBit.o client.o demarshal.o errors.o extras.o exttypes.o idl.o interfaces.o marshal.o server.o types.o]
-#     OPTIMIZE => q[-g -Wall]
+#     OPTIMIZE => q[-g ]
 #     VERSION_FROM => q[ORBit.pm]
 #     dist => { COMPRESS=>q[gzip], SUFFIX=>q[gz] }

@@ -115,7 +115,7 @@
 PARENT_NAME = CORBA
 DLBASE = $(BASEEXT)
 VERSION_FROM = ORBit.pm
-INC = -I/software/@sys/usr/include/glib-1.2 -I/software/@sys/usr/lib/glib/include -I/software/@sys/usr/include/orbit-1.0
+INC = -I/software/@sys/usr/include/glib-1.2 -I/software/@sys/usr/lib/glib/include -I/software/@sys/usr/include/orbit-1.0 -I/software/@sys/usr/include/libIDL-2.0 -I/software/@sys/usr/include

 DEFINE =
 OBJECT = ORBit$(OBJ_EXT) client$(OBJ_EXT) demarshal$(OBJ_EXT) errors$(OBJ_EXT) extras$(OBJ_EXT) exttypes$(OBJ_EXT) idl$(OBJ_EXT) interfaces$(OBJ_EXT) marshal$(OBJ_EXT) server$(OBJ_EXT) types$(OBJ_EXT)
@@ -322,8 +322,8 @@

 # --- MakeMaker cflags section:

-CCFLAGS = -pthread -std -D_INTRINSICS -fprm d -ieee -I/usr/local/include -DLANGUAGE_C
-OPTIMIZE = -g -Wall
+CCFLAGS = -pthread -std1 -D_INTRINSICS -fprm d -ieee -I/usr/local/include -DLANGUAGE_C
+OPTIMIZE = -g
 PERLTYPE =
 MPOLLUTE =

diff -r -u -w CORBA-ORBit-0.4.3/Makefile.PL CORBA-ORBit-0.4.3-new/Makefile.PL
--- CORBA-ORBit-0.4.3/Makefile.PL       2000-10-25 09:27:13.000000000 +0200
+++ CORBA-ORBit-0.4.3-new/Makefile.PL   2003-01-10 03:36:05.000000000 +0100
@@ -38,8 +38,8 @@
     'INC'      => $orbit_cflags,
     'OBJECT'    => join(" ", @OBJECTS),
 #    'XSOPT'     => '-nolinenumbers',
-    'OPTIMIZE'  => '-g -Wall',
-#    'OPTIMIZE'  => '-O2 -Wall',
+    'OPTIMIZE'  => '-g ',
+#    'OPTIMIZE'  => '-O2 ',
     'MAP_TARGET' => 'orbitperl',
 #    'MAKEAPERL' => 1,
     'dist'      => { COMPRESS=>"gzip", SUFFIX=>"gz" },
diff -r -u -w CORBA-ORBit-0.4.3/interfaces.c CORBA-ORBit-0.4.3-new/interfaces.c
--- CORBA-ORBit-0.4.3/interfaces.c      2000-07-08 20:59:46.000000000 +0200
+++ CORBA-ORBit-0.4.3-new/interfaces.c  2003-01-10 03:33:22.000000000 +0100
@@ -274,7 +274,7 @@

        for (i = 0; i<contents->_length; i++)
            ;
-           //porbit_init_constant (pkgname, contents->_buffer[i]);
+           /*porbit_init_constant (pkgname, contents->_buffer[i]);*/
     }
     CORBA_free (contents);

diff -r -u -w CORBA-ORBit-0.4.3/server.h CORBA-ORBit-0.4.3-new/server.h
--- CORBA-ORBit-0.4.3/server.h  2000-03-25 20:23:20.000000000 +0100
+++ CORBA-ORBit-0.4.3-new/server.h      2003-01-10 03:32:44.000000000 +0100
@@ -19,7 +19,7 @@
  */
 struct _PORBitInstVars
 {
-    U32 magic;                 // 0x18981972
+    U32 magic;                 /* 0x18981972 */
     PortableServer_Servant servant;
 };


-- 
Martin Mokrejs <mmokrejs natur cuni cz>, <m mokrejs gsf de>
PGP5.0i key is at http://www.natur.cuni.cz/~mmokrejs
MIPS / Institute for Bioinformatics <http://mips.gsf.de>
GSF - National Research Center for Environment and Health
Ingolstaedter Landstrasse 1, D-85764 Neuherberg, Germany
tel.: +49-89-3187 3683 , fax: +49-89-3187 3585