[omniORB] OmniOrb 4.0.3 on OpenBsd 3.5

[Mark Zimmerman]

On Wed, Jun 09, 2004 at 08:47:33AM +0300, Adriaan Joubert wrote:
> Mark,
> 
>    thanks a lot for that! Took me a little while to get it going, as 
> another file needs modification. It is
> 
--snip--
> 
> I just copied the definitions from FreeBsd - they look fine and it 
> compiles fine with this, but if somebody spots anything please let me know.
> 
> Duncan, would it be possible to add these to the normal source tree? Do 
> you have a specific set of tests that need to pass before you can do that?
> 

I consolidated all of the changes into one patch file (attached) which
is based on the omniORB-4.0-latest.tar.gz snapshot from this morning
(09 June 2004).

-- Mark
-------------- next part --------------
*** omni/configure	Wed Feb 11 10:01:10 2004
--- omni-openbsd/configure	Wed Jun  9 08:24:27 2004
***************
*** 10139,10144 ****
--- 10139,10145 ----
    *-*-freebsd3*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="3";;
    *-*-freebsd4*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="4";;
    *-*-freebsd5*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="5";;
+   *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
    *-*-sco*)      plat_name="OSR5";     plat_def="__osr5__";     os_v="5";;
  esac
  
*** omni/configure.ac	Wed Feb 11 10:01:11 2004
--- omni-openbsd/configure.ac	Wed Jun  9 08:23:46 2004
***************
*** 161,166 ****
--- 161,167 ----
    *-*-freebsd3*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="3";;
    *-*-freebsd4*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="4";;
    *-*-freebsd5*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="5";;
+   *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
    *-*-sco*)      plat_name="OSR5";     plat_def="__osr5__";     os_v="5";;
  esac
  
*** omni/include/omnithread.h	Fri Feb  6 09:16:29 2004
--- omni-openbsd/include/omnithread.h	Wed Jun  9 08:23:33 2004
***************
*** 154,159 ****
--- 154,161 ----
  #elif defined(__freebsd__)
  #include <omnithread/posix.h>
  
+ #elif defined(__openbsd__)
+ #include <omnithread/posix.h>
  #elif defined(__rtems__)
  #include <omnithread/posix.h>
  #include <sched.h>
*** omni/mk/beforeauto.mk.in	Wed Feb 11 05:19:16 2004
--- omni-openbsd/mk/beforeauto.mk.in	Wed Jun  9 08:26:44 2004
***************
*** 1002,1007 ****
--- 1002,1016 ----
  endif
  
  ###################
+ ifdef OpenBSD
+ IMPORT_CPPFLAGS += -D__openbsd__
+ 
+ OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
+ OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10
+ OMNITHREAD_LIB += -pthread
+ endif
+ 
+ ###################
  ifdef OSR5
  IMPORT_CPPFLAGS += -D__osr5__