You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2004/11/25 18:30:36 UTC

cvs commit: xml-xerces/c/tests Makefile.incl runConfigure

cargilld    2004/11/25 09:30:36

  Modified:    c/samples Makefile.incl runConfigure
               c/tests  Makefile.incl runConfigure
  Log:
  Linux build using xlC.
  
  Revision  Changes    Path
  1.68      +15 -18    xml-xerces/c/samples/Makefile.incl
  
  Index: Makefile.incl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- Makefile.incl	11 Nov 2004 04:20:14 -0000	1.67
  +++ Makefile.incl	25 Nov 2004 17:30:36 -0000	1.68
  @@ -167,24 +167,21 @@
   
   #=============== LINUX SPECIFIC OPTIONS =========================
   ifeq (${PLATFORM}, LINUX)
  -
  -    ifeq (${CXX}, xlC_r)
  -        CMP= -c ${CXXFLAGS} -qnotempinc
  -        CC=${COMPILER} -D${PLATFORM}
  -        LINK =  ${COMPILER} ${LDFLAGS}
  -        ifeq (${BITSTOBUILD}, 64)                                   
  -	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000000
  -        else
  -	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000
  -        endif
  -    else
  -        CMP= -c ${CXXFLAGS}
  -        CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
  -        LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
  -        PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
  -        EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
  -    endif           
  -    SHLIBSUFFIX=.so    
  +  ifeq (${COMPILER}, xlC_r)	
  +    CMP= -c ${CXXFLAGS} -qnotempinc
  +    CC= ${COMPILER} -c -D${PLATFORM} 
  +    LINK =  ${COMPILER} ${LDFLAGS}
  +    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
  +    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
  +    SHLIBSUFFIX=.so
  +  else
  +    CMP= -c ${CXXFLAGS}
  +    CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
  +    LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
  +    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
  +    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
  +    SHLIBSUFFIX=.so
  +  endif
   endif
   
   #=============== QNX SPECIFIC OPTIONS =========================
  
  
  
  1.47      +10 -2     xml-xerces/c/samples/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- runConfigure	9 Sep 2004 23:52:24 -0000	1.46
  +++ runConfigure	25 Nov 2004 17:30:36 -0000	1.47
  @@ -381,7 +381,15 @@
                      esac
                  fi ;;           
              linux)
  -              bitstobuildDefines=" $bitstobuildDefines " ;;
  +               if test $cppcompiler; then
  +                   case $cppcompiler in
  +                       xlC*)
  +                          bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 "
  +                          bitstobuildLink=" -q64 " ;;
  +                       *)
  +                       ;;
  +                   esac
  +               fi ;;           
              *)
               ;;
           esac
  
  
  
  1.51      +14 -18    xml-xerces/c/tests/Makefile.incl
  
  Index: Makefile.incl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- Makefile.incl	11 Nov 2004 04:21:23 -0000	1.50
  +++ Makefile.incl	25 Nov 2004 17:30:36 -0000	1.51
  @@ -167,25 +167,21 @@
   
   #=============== LINUX SPECIFIC OPTIONS =========================
   ifeq (${PLATFORM}, LINUX)
  -
  -    ifeq (${CXX}, xlC_r)
  -        CMP= -c ${CXXFLAGS} -qnotempinc
  -        CC=${COMPILER} -D${PLATFORM}
  -        LINK =  ${COMPILER} ${LDFLAGS}
  -
  -        ifeq (${BITSTOBUILD}, 64)                                   
  -	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000000
  -        else
  -	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000
  -        endif
  -    else
  -        CMP= -c ${CXXFLAGS}
  -        CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
  -        LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
  -        PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
  -        EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
  -    endif
  +  ifeq (${COMPILER}, xlC_r)
  +    CMP= -c ${CXXFLAGS} -qnotempinc
  +    CC= ${COMPILER} -c -D${PLATFORM}
  +    LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
  +    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
  +    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
       SHLIBSUFFIX=.so
  +  else
  +    CMP= -c ${CXXFLAGS}
  +    CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
  +    LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
  +    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
  +    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
  +    SHLIBSUFFIX=.so
  +  endif
   endif
   
   #=============== QNX SPECIFIC OPTIONS =========================
  
  
  
  1.39      +10 -2     xml-xerces/c/tests/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/tests/runConfigure,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- runConfigure	9 Sep 2004 23:52:24 -0000	1.38
  +++ runConfigure	25 Nov 2004 17:30:36 -0000	1.39
  @@ -380,7 +380,15 @@
                      esac
                  fi ;;              
              linux)
  -              bitstobuildDefines=" $bitstobuildDefines " ;;
  +               if test $cppcompiler; then
  +                   case $cppcompiler in
  +                       xlC*)
  +                          bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 "
  +                          bitstobuildLink=" -q64 " ;;
  +                       *)
  +                       ;;
  +                   esac
  +               fi ;;              
              *)
               ;;
           esac
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org