omniORB2 snapshot_971112
Andrey Slepuhin
pooh@msu.ru
Tue, 18 Nov 1997 13:56:22 +0300
This is a multi-part message in MIME format.
--------------223F6E66753760D0E3586D31
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Here is a patch to build snapshot_971112 on AIX 4.2 with C Set++ 3.1.4
compiler. -O flag is omitted due to errors during tests compilation.
I still have messages about undefined commands during make stage after
entering each subdirectory but these message have no side effects.
I didn't find the matter of these messages yet. Well, I'll try to run
the
tests (examples seem to be Ok). One note: it would be better to enclose
all output of multithreaded examples with lock/unlock of a global mutex
to avoid funny result (it seems to me that xlC's C++ library I/O part
is not completely thread-safe).
Andrey.
--------------223F6E66753760D0E3586D31
Content-Type: text/plain; charset=us-ascii; name="aix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="aix.diff"
diff -c -r /local/src/snapshot_971112/config/config.mk snapshot_971112/config/config.mk
*** /local/src/snapshot_971112/config/config.mk Thu Nov 13 22:08:18 1997
--- snapshot_971112/config/config.mk Fri Nov 14 23:17:27 1997
***************
*** 10,16 ****
#platform = i586_linux_2.0
#platform = alpha_osf1_3.2
#platform = alpha_osf1_4.0
! #platform = powerpc_aix_4.2
#platform = x86_nt_3.5
#platform = hppa_hpux_10.20
--- 10,16 ----
#platform = i586_linux_2.0
#platform = alpha_osf1_3.2
#platform = alpha_osf1_4.0
! platform = powerpc_aix_4.2
#platform = x86_nt_3.5
#platform = hppa_hpux_10.20
diff -c -r /local/src/snapshot_971112/mk/unix.mk snapshot_971112/mk/unix.mk
*** /local/src/snapshot_971112/mk/unix.mk Sat Sep 20 21:18:34 1997
--- snapshot_971112/mk/unix.mk Tue Nov 18 13:07:15 1997
***************
*** 15,21 ****
#
RANLIB = ranlib
! MKDIRHIER = omkdirhier
INSTALL = installbsd -c
INSTLIBFLAGS = -m 0644
INSTEXEFLAGS = -m 0755
--- 15,21 ----
#
RANLIB = ranlib
! MKDIRHIER = mkdirhier
INSTALL = installbsd -c
INSTLIBFLAGS = -m 0644
INSTEXEFLAGS = -m 0755
diff -c -r /local/src/snapshot_971112/mk/platforms/powerpc_aix_4.2.mk snapshot_971112/mk/platforms/powerpc_aix_4.2.mk
*** /local/src/snapshot_971112/mk/platforms/powerpc_aix_4.2.mk Wed Nov 12 20:02:08 1997
--- snapshot_971112/mk/platforms/powerpc_aix_4.2.mk Sat Nov 15 11:19:15 1997
***************
*** 26,36 ****
RANLIB = ranlib
MKDIRHIER = /usr/bin/X11/mkdirhier
CXX = xlc_r
! CXXDEBUGFLAGS = -O
CXXLINK = xlC_r
! INSTALL = install -c
#
# CORBA stuff
--- 26,37 ----
RANLIB = ranlib
MKDIRHIER = /usr/bin/X11/mkdirhier
CXX = xlc_r
! CXXDEBUGFLAGS =
CXXLINK = xlC_r
! INSTALL = installbsd -c
+ CLINK = xlC_r
#
# CORBA stuff
***************
*** 41,46 ****
--- 42,49 ----
#
# OMNI thread stuff
#
+
+ ThreadSystem = Posix
OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=8
OMNITHREAD_CPPFLAGS = -I$(TOP)/include -D_REENTRANT
diff -c -r /local/src/snapshot_971112/src/appl/omniNames/dir.mk snapshot_971112/src/appl/omniNames/dir.mk
*** /local/src/snapshot_971112/src/appl/omniNames/dir.mk Mon Jul 21 18:53:16 1997
--- snapshot_971112/src/appl/omniNames/dir.mk Sat Nov 15 00:46:16 1997
***************
*** 7,13 ****
else
DEFAULT_LOGDIR = \"/var/omniNames\"
! DIR_CPPFLAGS = $(CORBA_CPPFLAGS) -DDEFAULT_LOGDIR=$(DEFAULT_LOGDIR)
endif
--- 7,13 ----
else
DEFAULT_LOGDIR = \"/var/omniNames\"
! DIR_CPPFLAGS = -I. $(CORBA_CPPFLAGS) -DDEFAULT_LOGDIR=$(DEFAULT_LOGDIR)
endif
diff -c -r /local/src/snapshot_971112/src/examples/thread/dir.mk snapshot_971112/src/examples/thread/dir.mk
*** /local/src/snapshot_971112/src/examples/thread/dir.mk Tue Mar 11 13:07:01 1997
--- snapshot_971112/src/examples/thread/dir.mk Sat Nov 15 01:08:11 1997
***************
*** 1,6 ****
CXXSRCS = diner.cc prio.cc thrspecdata.cc prodcons.cc
! DIR_CPPFLAGS = $(OMNITHREAD_CPPFLAGS)
diner = $(patsubst %,$(BinPattern),diner)
prio = $(patsubst %,$(BinPattern),prio)
--- 1,6 ----
CXXSRCS = diner.cc prio.cc thrspecdata.cc prodcons.cc
! DIR_CPPFLAGS = -g $(OMNITHREAD_CPPFLAGS)
diner = $(patsubst %,$(BinPattern),diner)
prio = $(patsubst %,$(BinPattern),prio)
diff -c -r /local/src/snapshot_971112/src/lib/omniORB2/dir.mk snapshot_971112/src/lib/omniORB2/dir.mk
*** /local/src/snapshot_971112/src/lib/omniORB2/dir.mk Wed Nov 12 16:07:13 1997
--- snapshot_971112/src/lib/omniORB2/dir.mk Sat Nov 15 00:21:57 1997
***************
*** 73,79 ****
$(NETLIBOBJS)
DIR_CPPFLAGS += $(OMNITHREAD_CPPFLAGS)
! DIR_CPPFLAGS += -I./..
DIR_CPPFLAGS += -D__OMNIORB__
CXXSRCS = $(ORB2_SRCS)
--- 73,79 ----
$(NETLIBOBJS)
DIR_CPPFLAGS += $(OMNITHREAD_CPPFLAGS)
! DIR_CPPFLAGS += -I. -I./..
DIR_CPPFLAGS += -D__OMNIORB__
CXXSRCS = $(ORB2_SRCS)
diff -c -r /local/src/snapshot_971112/src/lib/omniORB2/initFile.cc snapshot_971112/src/lib/omniORB2/initFile.cc
*** /local/src/snapshot_971112/src/lib/omniORB2/initFile.cc Tue Nov 4 15:44:41 1997
--- snapshot_971112/src/lib/omniORB2/initFile.cc Sat Nov 15 00:27:47 1997
***************
*** 220,226 ****
{
if (omniORB::traceLevel > 0) {
#ifndef __atmos__
! cerr << "Configuration error: Unknown field (" << entryname << ") "
<< " found in configuration." << endl;
#else
kprintf("Configuration error: ");
--- 220,226 ----
{
if (omniORB::traceLevel > 0) {
#ifndef __atmos__
! cerr << "Configuration error: Unknown field (" << (const char*)entryname << ") "
<< " found in configuration." << endl;
#else
kprintf("Configuration error: ");
diff -c -r /local/src/snapshot_971112/src/lib/omniORB2/sharedlib/dir.mk snapshot_971112/src/lib/omniORB2/sharedlib/dir.mk
*** /local/src/snapshot_971112/src/lib/omniORB2/sharedlib/dir.mk Wed Nov 12 20:25:08 1997
--- snapshot_971112/src/lib/omniORB2/sharedlib/dir.mk Sat Nov 15 00:43:41 1997
***************
*** 177,183 ****
$(RM) $@; \
makeC++SharedLib \
-o $@ $(IMPORT_LIBRARY_FLAGS) \
- $(patsubst %,-R %,$(IMPORT_LIBRARY_DIRS)) \
$(filter-out $(LibSuffixPattern),$^) $(OMNITHREAD_LIB) \
-lC -lc_r -lc -p 40; \
)
--- 177,182 ----
diff -c -r /local/src/snapshot_971112/src/lib/omnithread/dir.mk snapshot_971112/src/lib/omnithread/dir.mk
*** /local/src/snapshot_971112/src/lib/omnithread/dir.mk Fri Nov 14 19:35:51 1997
--- snapshot_971112/src/lib/omnithread/dir.mk Sat Nov 15 01:02:49 1997
***************
*** 7,13 ****
ifeq ($(ThreadSystem),Posix)
CXXSRCS = posix.cc
OBJS = posix.o
! DIR_CPPFLAGS = $(OMNITHREAD_CPPFLAGS) $(OMNITHREAD_POSIX_CPPFLAGS)
endif
ifeq ($(ThreadSystem),NT)
--- 7,13 ----
ifeq ($(ThreadSystem),Posix)
CXXSRCS = posix.cc
OBJS = posix.o
! DIR_CPPFLAGS = -g $(OMNITHREAD_CPPFLAGS) $(OMNITHREAD_POSIX_CPPFLAGS)
endif
ifeq ($(ThreadSystem),NT)
diff -c -r /local/src/snapshot_971112/src/lib/omnithread/posix.cc snapshot_971112/src/lib/omnithread/posix.cc
*** /local/src/snapshot_971112/src/lib/omnithread/posix.cc Thu Nov 13 19:29:41 1997
--- snapshot_971112/src/lib/omnithread/posix.cc Tue Nov 18 13:26:58 1997
***************
*** 332,337 ****
--- 332,338 ----
pthread_attr_t attr;
pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_UNDETACHED);
THROW_ERRORS(pthread_attr_setprio(&attr, posix_priority(PRIORITY_NORMAL)));
***************
*** 472,477 ****
--- 473,479 ----
pthread_attr_create(&attr);
#else
pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_UNDETACHED);
#endif
#ifdef PthreadSupportThreadPriority
***************
*** 595,600 ****
--- 597,603 ----
pthread_attr_t attr;
pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_UNDETACHED);
THROW_ERRORS(pthread_attr_setprio(&attr, posix_priority(pri)));
diff -c -r /local/src/snapshot_971112/src/lib/omnithread/sharedlib/dir.mk snapshot_971112/src/lib/omnithread/sharedlib/dir.mk
*** /local/src/snapshot_971112/src/lib/omnithread/sharedlib/dir.mk Wed Nov 12 20:30:24 1997
--- snapshot_971112/src/lib/omnithread/sharedlib/dir.mk Sat Nov 15 00:19:52 1997
***************
*** 142,150 ****
$(RM) $@; \
makeC++SharedLib \
-o $@ $(IMPORT_LIBRARY_FLAGS) \
- $(patsubst %,-R %,$(IMPORT_LIBRARY_DIRS)) \
$(filter-out $(LibSuffixPattern),$^) \
! -lC -lc_r -lc -p 40; \
)
all:: $(lib)
--- 142,149 ----
$(RM) $@; \
makeC++SharedLib \
-o $@ $(IMPORT_LIBRARY_FLAGS) \
$(filter-out $(LibSuffixPattern),$^) \
! -lC -lpthreads -lc_r -lc -p 40; \
)
all:: $(lib)
diff -c -r /local/src/snapshot_971112/src/tests/omniORB2_testsuite/all_idls/dir.mk snapshot_971112/src/tests/omniORB2_testsuite/all_idls/dir.mk
*** /local/src/snapshot_971112/src/tests/omniORB2_testsuite/all_idls/dir.mk Thu Nov 13 17:49:43 1997
--- snapshot_971112/src/tests/omniORB2_testsuite/all_idls/dir.mk Sat Nov 15 11:20:44 1997
***************
*** 1,4 ****
! DIR_CPPFLAGS = $(CORBA_CPPFLAGS)
OBJS = NamingSK.o \
ERASK.o \
--- 1,4 ----
! DIR_CPPFLAGS = $(CORBA_CPPFLAGS) -I.
OBJS = NamingSK.o \
ERASK.o \
diff -c -r /local/src/snapshot_971112/src/tests/omniORB2_testsuite/basic_tests/tstexceptclt.cc snapshot_971112/src/tests/omniORB2_testsuite/basic_tests/tstexceptclt.cc
*** /local/src/snapshot_971112/src/tests/omniORB2_testsuite/basic_tests/tstexceptclt.cc Mon Nov 10 21:19:44 1997
--- snapshot_971112/src/tests/omniORB2_testsuite/basic_tests/tstexceptclt.cc Sat Nov 15 11:31:37 1997
***************
*** 73,79 ****
e->trigger(yes);
}
catch (Terrmsg &ex) {
! cerr << "Caught Texcept: " << ex.msg << endl;
}
}
else {
--- 73,79 ----
e->trigger(yes);
}
catch (Terrmsg &ex) {
! cerr << "Caught Texcept: " << (char*)ex.msg << endl;
}
}
else {
diff -c -r /local/src/snapshot_971112/src/tests/omniORB2_testsuite/common/dir.mk snapshot_971112/src/tests/omniORB2_testsuite/common/dir.mk
*** /local/src/snapshot_971112/src/tests/omniORB2_testsuite/common/dir.mk Sat Nov 8 01:01:35 1997
--- snapshot_971112/src/tests/omniORB2_testsuite/common/dir.mk Sat Nov 15 11:29:31 1997
***************
*** 1,6 ****
--- 1,8 ----
CXXSRCS = nameUtils.cc
OBJS = nameUtils.o
+ DIR_CPPFLAGS = $(CORBA_CPPFLAGS)
+
lib = $(patsubst %,$(LibPattern),common)
all:: $(lib)
diff -c -r /local/src/snapshot_971112/src/tests/omniORB2_testsuite/forwarding/dir.mk snapshot_971112/src/tests/omniORB2_testsuite/forwarding/dir.mk
*** /local/src/snapshot_971112/src/tests/omniORB2_testsuite/forwarding/dir.mk Mon Nov 10 18:11:19 1997
--- snapshot_971112/src/tests/omniORB2_testsuite/forwarding/dir.mk Sat Nov 15 11:40:00 1997
***************
*** 1,6 ****
CXXSRCS = reDirect.cc tombstone.cc colocated.cc
! DIR_CPPFLAGS = $(CORBA_CPPFLAGS) -I.. $(patsubst %,-I%/..,$(VPATH))
CORBA_INTERFACES = attrObjRef echo shutdown
--- 1,6 ----
CXXSRCS = reDirect.cc tombstone.cc colocated.cc
! DIR_CPPFLAGS = $(CORBA_CPPFLAGS) -I.. -I. $(patsubst %,-I%/..,$(VPATH))
CORBA_INTERFACES = attrObjRef echo shutdown
diff -c -r /local/src/snapshot_971112/src/tool/omniidl2/fe/dir.mk snapshot_971112/src/tool/omniidl2/fe/dir.mk
*** /local/src/snapshot_971112/src/tool/omniidl2/fe/dir.mk Tue Nov 4 14:46:45 1997
--- snapshot_971112/src/tool/omniidl2/fe/dir.mk Fri Nov 14 23:50:21 1997
***************
*** 16,22 ****
fe_extern.o \
fe_interface_header.o
! DIR_CPPFLAGS = -I../include $(patsubst %,-I%/../include,$(VPATH))
lib = $(patsubst %,$(LibPattern),fe)
--- 16,22 ----
fe_extern.o \
fe_interface_header.o
! DIR_CPPFLAGS = -I. -I../include $(patsubst %,-I%/../include,$(VPATH))
lib = $(patsubst %,$(LibPattern),fe)
diff -c -r /local/src/snapshot_971112/src/tool/omniidl2/include/idl.hh snapshot_971112/src/tool/omniidl2/include/idl.hh
*** /local/src/snapshot_971112/src/tool/omniidl2/include/idl.hh Tue Nov 4 14:57:35 1997
--- snapshot_971112/src/tool/omniidl2/include/idl.hh Fri Nov 14 23:57:57 1997
***************
*** 74,79 ****
--- 74,82 ----
#include <stdlib.h> // POSIX standard defns
#include <string.h> // POSIX string funcs
+ #ifdef __aix__
+ #include <strings.h>
+ #endif
#include <ctype.h> // External functions
#include <iostream.h> // Standard IO library
diff -c -r /local/src/snapshot_971112/src/tool/omniidl2/omniORB2_be/dir.mk snapshot_971112/src/tool/omniidl2/omniORB2_be/dir.mk
*** /local/src/snapshot_971112/src/tool/omniidl2/omniORB2_be/dir.mk Tue Nov 4 14:47:30 1997
--- snapshot_971112/src/tool/omniidl2/omniORB2_be/dir.mk Fri Nov 14 23:59:07 1997
***************
*** 42,48 ****
o2be_union.o \
o2be_union_branch.o
! DIR_CPPFLAGS = -I../include $(patsubst %,-I%/../include,$(VPATH))
lib = $(patsubst %,$(LibPattern),omniORB2_be)
--- 42,48 ----
o2be_union.o \
o2be_union_branch.o
! DIR_CPPFLAGS = -I. -I../include $(patsubst %,-I%/../include,$(VPATH))
lib = $(patsubst %,$(LibPattern),omniORB2_be)
--------------223F6E66753760D0E3586D31--