[omniORB] Re: Problems with omniORB and AIX XLC 3.6.4 compiler

[Craig Rodrigues]

--pWyiEgJYm5f9v55/
Content-Type: text/plain; charset=us-ascii

Hello,

Here are some diffs I made to some of the Makefiles related
to AIX.  I basically added some variables for detecting the
version of AIX (4.2, 4.3), and the version of xlC (3.1, 3.6)
being used.

In the following files:
omniORB_280pre1/src/lib/omnithread/sharedlib/dir.mk
omniORB_280pre1/src/lib/omniORB2/orbcore/sharedlib/dir.mk
omniORB_280pre1/src/lib/omniORB2/dynamic/sharedlib/dir.mk
omniORB_280pre1/src/lib/omniORB2/lifecycle/sharedlib/dir.mk

I changed:

 /usr/lpp/xlC/bin/makeC++SharedLib_r 

to:

$(MAKECPPSHAREDLIB)

I am testing on a configuration of AIX 4.2.1.0 and xlC 3.6.4.

Opinions?
-- 
Craig Rodrigues        
http://www.gis.net/~craigr    
rodrigc@mediaone.net          

--pWyiEgJYm5f9v55/
Content-Type: text/plain
Content-Disposition: attachment; filename="powerpc_aix_4.2.mk.diffs.txt"

*** powerpc_aix_4.2.mk.orig	Wed Jul 21 21:58:37 1999
--- powerpc_aix_4.2.mk	Wed Jul 21 21:59:56 1999
***************
*** 6,11 ****
--- 6,14 ----
  AIX = 1
  PowerPCProcessor = 1
  
+ AIX_MAJOR_VERS := $(shell uname -v)
+ AIX_MINOR_VERS := $(shell uname -r)
+ 
  #
  # Include general unix things
  #
***************
*** 47,53 ****
--- 50,68 ----
  CC               = xlC_r
  CLINK           = xlC_r
  
+ XLCVERSION := $(shell echo "__xlC__" > /tmp/testAIXCompilerVersion.C )
+ XLCVERSION := $(shell $(CXX) -+ -E /tmp/testAIXCompilerVersion.C | tail -1')
  
+ ifeq ($(XLCVERSION),0x0306)
+   MAKECPPSHAREDLIB = /usr/ibmcxx/bin/makeC++SharedLib_r
+ endif
+ 
+ ifeq ($(XLCVERSION),0x0301)
+    MAKECPPSHAREDLIB = /usr/lpp/xlC/bin/makeC++SharedLib_r
+ endif
+ 
+ 
+ 
  # Name all static libraries with -ar.a suffix.
  LibPattern = lib%-ar.a
  LibSuffixPattern = %-ar.a
***************
*** 86,93 ****
  # OMNI thread stuff
  #
  ThreadSystem = Posix
  
! OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=8
  OMNITHREAD_CPPFLAGS = -I$(TOP)/include -D_REENTRANT -D_THREAD_SAFE
  OMNITHREAD_LIB = -lomnithread2 -lpthreads
  OMNITHREAD_STATIC_LIB = -lomnithread-ar -lpthreads-ar
--- 101,116 ----
  # OMNI thread stuff
  #
  ThreadSystem = Posix
+ ifeq ($(AIX_MINOR_VERS), 2)
+   PTHREAD_DRAFT_VERS = -DPthreadDraftVersion=8
+ endif
  
! ifeq ($(AIX_MINOR_VERSION), 3)
!      PTHREAD_DRAFT_VERS = -DPthreadDraftVersion=10
! endif
! 
! 
! OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep $(PTHREAD_DRAFT_VERS)
  OMNITHREAD_CPPFLAGS = -I$(TOP)/include -D_REENTRANT -D_THREAD_SAFE
  OMNITHREAD_LIB = -lomnithread2 -lpthreads
  OMNITHREAD_STATIC_LIB = -lomnithread-ar -lpthreads-ar

--pWyiEgJYm5f9v55/--