[omniORB] patches for nextstep x86

Ted Horst Ted.Horst@wdr.com
Mon, 14 Feb 2000 14:21:06 -0600


--NeXT-Mail-368631416-1
Content-Type: text/enriched; charset=us-ascii
Content-Transfer-Encoding: quoted-printable


Here are some patches to build omniORB and omniORBpy on x86 NeXTStep 3.3.


*** omni/config/config.mk.orig  Mon Feb 14 14:08:12 2000

--- omni/config/config.mk       Fri Feb 11 11:59:55 2000

***************

*** 56,61 ****

--- 56,62 ----

  #platform =3D i586_linux_2.0_glibc2.1

  #platform =3D powerpc_linux_2.2_glibc

  #platform =3D m68k_nextstep_3.3

+ #platform =3D x86_nextstep_3.3

  #platform =3D mips_sinux_5.43

  #platform =3D mips_irix_6.2_n32

  #platform =3D mips_irix_6.3_n32

*** omni/include/omniORB2/CORBA_sysdep.h.orig   Fri Feb 11 11:53:56 2000

--- omni/include/omniORB2/CORBA_sysdep.h        Fri Feb 11 12:36:55 2000

***************

*** 336,341 ****

--- 336,346 ----

  # define _OMNIORB_HOST_BYTE_ORDER_ 1

  # if !defined(__WIN32__)

  #  define _HAS_SIGNAL 1

+ #  if defined(__nextstep__)

+ #   define _USE_MACH_SIGNAL 1

+ #   define _NO_STRDUP 1

+ #   define _USE_GETHOSTNAME 1

+ #  endif

  # endif

  #elif defined(__linux__) && defined(__powerpc__)

  # define _OMNIORB_HOST_BYTE_ORDER_ 0

*** omni/src/lib/omnithread/mach.cc.orig        Fri Feb 11 12:12:21 2000

--- omni/src/lib/omnithread/mach.cc     Mon Feb 14 10:56:16 2000

***************

*** 226,231 ****

--- 226,232 ----

      return 0;

 =20

    value--;

+   return 1;

 =20

 =20

 =20

***************

*** 271,277 ****

 =20

    error =3D thread_info(thread_self(), THREAD_SCHED_INFO, =
(thread_info_t)&info, &info_count);

    if (error !=3D KERN_SUCCESS)=20

!     cerr <<<< "omni_thread::init: error determining thread_info" <<<< =
endl;

      ::exit(1);

   =20

    else=20

--- 272,278 ----

 =20

    error =3D thread_info(thread_self(), THREAD_SCHED_INFO, =
(thread_info_t)&info, &info_count);

    if (error !=3D KERN_SUCCESS)=20

!     DB(cerr <<<< "omni_thread::init: error determining thread_info" <<<< =
endl);

      ::exit(1);

   =20

    else=20

***************

*** 288,294 ****

    omni_thread* t =3D new omni_thread;

 =20

    if (t->_state !=3D STATE_NEW)=20

!     cerr <<<< "omni_thread::init: problem creating initial thread =
object";

      ::exit(1);

   =20

 =20

--- 289,295 ----

    omni_thread* t =3D new omni_thread;

 =20

    if (t->_state !=3D STATE_NEW)=20

!     DB(cerr <<<< "omni_thread::init: problem creating initial thread =
object");

      ::exit(1);

   =20

 =20

***************

*** 539,545 ****

        me->mutex.lock();

 =20

        if (me->_state !=3D STATE_RUNNING)

!       cerr <<<< "omni_thread::exit: thread not in "running" state";

 =20

        me->_state =3D STATE_TERMINATED;

 =20

--- 540,546 ----

        me->mutex.lock();

 =20

        if (me->_state !=3D STATE_RUNNING)

!       DB(cerr <<<< "omni_thread::exit: thread not in "running" state");

 =20

        me->_state =3D STATE_TERMINATED;

 =20

*** omni/src/lib/omniORBpy/modules/omnipy/dir.mk.orig   Fri Feb 11 =
14:39:16 2000

--- omni/src/lib/omniORBpy/modules/omnipy/dir.mk        Mon Feb 14 =
11:21:12 2000

***************

*** 252,254 ****

--- 252,288 ----

            ln -s $(soname) $(libname);=20

           )

  endif

+ =
############################################################################=
#

+ #   Make rules for NextStep                                              =
   #

+ =
############################################################################=
#

+=20

+ ifdef NextStep

+=20

+ PYPREFIX =3D $(shell python -c "import sys;print sys.exec_prefix")

+=20

+ CXXOPTIONS +=3D -I$(PYPREFIX)/include

+ CXXLINKOPTIONS +=3D -nostdlib -r

+ SO=3D           .so

+=20

+ libname =3D _omnipymodule$(SO)

+ soname  =3D $(libname).$(OMNIPY_MAJOR)

+ lib     =3D $(soname).$(OMNIPY_MINOR)

+=20

+ $(lib): $(OBJS)

+       $(CXXLINK) $(CXXLINKOPTIONS) $(OBJS) $(OMNIORB2_LIB_NODYN_DEPEND) =
-o $(lib)

+=20

+ all:: $(lib)

+=20

+ clean::

+       $(RM) $(lib)

+=20

+ export:: $(lib)

+       @$(ExportLibrary)

+       @(set -x;=20

+               cd $(EXPORT_TREE)/$(LIBDIR);=20

+               $(RM) $(soname);=20

+               ln -s $(lib) $(soname);=20

+               $(RM) $(libname);=20

+               ln -s $(soname) $(libname);=20

+       )

+ endif

*** omni/src/lib/omniORBpy/omniidl/cxx/dir.mk.orig      Fri Feb 11 =
17:26:29 2000

--- omni/src/lib/omniORBpy/omniidl/cxx/dir.mk   Mon Feb 14 11:21:30 2000

***************

*** 262,267 ****

--- 262,301 ----

  endif

 =20

 =20

+ =
############################################################################=
#

+ #   Make rules for NextStep                                              =
   #

+ =
############################################################################=
#

+=20

+ ifdef NextStep

+=20

+ PYPREFIX =3D $(shell python -c "import sys;print sys.exec_prefix")

+=20

+ CXXOPTIONS +=3D -I$(PYPREFIX)/include

+ CXXLINKOPTIONS +=3D -nostdlib -r

+ SO=3D           .so

+=20

+ libname =3D _omniidlmodule$(SO)

+ soname  =3D $(libname).$(IDLMODULE_MAJOR)

+ lib     =3D $(soname).$(IDLMODULE_MINOR)

+=20

+ $(lib): $(OBJS) $(PYOBJS)

+       $(CXXLINK) $(CXXLINKOPTIONS) $(OBJS) $(PYOBJS) -o $(lib)

+=20

+ all:: $(lib)

+=20

+ clean::

+       $(RM) $(lib)

+=20

+ export:: $(lib)

+       @$(ExportLibrary)

+       @(set -x;=20

+               cd $(EXPORT_TREE)/$(LIBDIR);=20

+               $(RM) $(soname);=20

+               ln -s $(lib) $(soname);=20

+               $(RM) $(libname);=20

+               ln -s $(soname) $(libname);=20

+       )

+ endif

 =20

  =
############################################################################=
#

  #   Test executable                                                      =
   #

*** omni/src/lib/omniORBpy/omniidl/cxx/cccp/config.h.orig       Fri Feb 11 =
14:28:40 2000

--- omni/src/lib/omniORBpy/omniidl/cxx/cccp/config.h    Fri Feb 11 =
14:29:04 2000

***************

*** 19,24 ****

--- 19,27 ----

  #elif defined(__VMS)

  #include "config-vms.h"

 =20

+ #elif defined(__nextstep__)

+ #include "config-nextstep.h"

+=20

  #endif

 =20

  #define BITS_PER_UNIT SIZEOF_UNSIGNED_CHAR



and add the following 2 files:


omni/mk/platforms/x86_nextstep_3.3.mk:


--NeXT-Mail-368631416-1
Content-Type: application/octet-stream; name=x86_nextstep_3.3.mk;
	x-unix-mode=0644
Content-Transfer-Encoding: quoted-printable

#
# m68k_nextstep_3.3.mk - make variables and rules specific to m68k =
nextstep 3.3
#

NextStep =3D 1
x86Processor =3D 1


#
# Include general unix things
#

include $(THIS_IMPORT_TREE)/mk/unix.mk


#
# Standard programs
#

AR =3D ar cq
MKDIRHIER =3D mkdirs

#  gcc cpp
#  CPP =3D /usr/local/lib/gcc-lib/m68k-next-nextstep3/2.7.2/cpp

#  standard cpp
CPP =3D /lib/cpp

CXX =3D g++
CXXMAKEDEPEND =3D $(TOP)/$(BINDIR)/omkdepend -D__cplusplus -D__GNUG__ =
-D__GNUC__
CXXDEBUGFLAGS =3D=20
CXXOPTIONS    =3D  -Wall -Wno-unused

CXXLINK		=3D $(CXX)
CXXLINKOPTIONS  =3D $(CXXDEBUGFLAGS) $(CXXOPTIONS)

CC           =3D gcc
CMAKEDEPEND  =3D $(TOP)/$(BINDIR)/omkdepend -D__GNUC__
CDEBUGFLAGS  =3D -O

CLINK        =3D $(CC)
CLINKOPTIONS =3D $(CDEBUGFLAGS) $(COPTIONS)
INSTALL =3D install -c

IMPORT_CPPFLAGS +=3D -D__x86__ -D__nextstep__ -D__OSVERSION__=3D3


#
# CORBA stuff
#

#omniORB2GatekeeperImplementation =3D OMNIORB2_TCPWRAPGK
#omniORB2GatekeeperImplementation =3D NO_IMPL
omniORB2GatekeeperImplementation =3D OMNIORB2_DUMMYGK
CorbaImplementation =3D OMNIORB2

#
# OMNI thread stuff
#

ThreadSystem =3D Mach
OMNITHREAD_CPPFLAGS =3D -D_REENTRANT
OMNITHREAD_LIB =3D $(patsubst %,$(LibSearchPattern),omnithread)

lib_depend :=3D $(patsubst %,$(LibPattern),omnithread)
OMNITHREAD_LIB_DEPEND :=3D $(GENERATE_LIB_DEPEND)


# Default location of the omniORB2 configuration file [falls back to this =
if
# the environment variable OMNIORB_CONFIG is not set] :

OMNIORB_CONFIG_DEFAULT_LOCATION =3D /etc/omniORB.cfg

# Default directory for the omniNames log files.
OMNINAMES_LOG_DEFAULT_LOCATION =3D /var/omninames

--NeXT-Mail-368631416-1
Content-Type: text/enriched; charset=us-ascii
Content-Transfer-Encoding: 7bit



omni/src/lib/omniORBpy/omniidl/cxx/cccp/config-nextstep.h:


--NeXT-Mail-368631416-1
Content-Type: application/octet-stream; name=config-nextstep.h;
	x-unix-mode=0644
Content-Transfer-Encoding: 7bit

#ifdef __x86__

#define SIZEOF_UNSIGNED_CHAR 1
#define SIZEOF_INT 4
#define HAVE_STDLIB_H 1
#define HAVE_STRERROR 1

#endif

--NeXT-Mail-368631416-1
Content-Type: text/enriched; charset=us-ascii
Content-Transfer-Encoding: 7bit




-----------------------------

Ted Horst <<Ted.Horst@wdr.com>

"the day serious reasoning about programs becomes widespread is the day

most programmers abandon their craft to resume drug trafficking <<wink>."

--Tim Peters on comp.lang.python