xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject cvs commit: xml-xerces/c/src/util/Compilers GCCDefs.hpp
Date Thu, 08 Feb 2001 14:15:34 GMT
tng         01/02/08 06:15:34

  Modified:    c/src    Makefile.incl runConfigure
               c/src/util XercesDefs.hpp
               c/src/util/Compilers GCCDefs.hpp
  Log:
  enable COMPAQ Tru64 UNIX machines to build xerces-c with gcc (tested using COMPAQ gcc version2.95.2
19991024 (release) and Tru64 V5.0 1094).  Added by Martin Kalen.
  
  Revision  Changes    Path
  1.35      +18 -8     xml-xerces/c/src/Makefile.incl
  
  Index: Makefile.incl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/Makefile.incl,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Makefile.incl	2000/12/22 16:32:48	1.34
  +++ Makefile.incl	2001/02/08 14:15:33	1.35
  @@ -54,7 +54,7 @@
   # <http://www.apache.org/>.
   #
   #
  -# $Id: Makefile.incl,v 1.34 2000/12/22 16:32:48 tng Exp $
  +# $Id: Makefile.incl,v 1.35 2001/02/08 14:15:33 tng Exp $
   #
   
   ###################################################################
  @@ -358,15 +358,25 @@
   
   #=============== TRU64 SPECIFIC OPTIONS =========================
   ifeq (${PLATFORM}, TRU64)
  -PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XERCESCROOT}/.cxx_repository
  -MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository
  -MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
  -ifeq (${TRANSCODER}, ICU)
  +  SHLIBSUFFIX=.so
  +  MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
  +  ifeq (${CXX}, g++)
  +    MAKE_SHARED = ${CXX} -D${PLATFORM} -shared
  +    PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
  +    ifeq (${TRANSCODER}, ICU)
  +      ALLLIBS = ${LIBS} -licu-uc -licudata -lc -lrt
  +    else
  +      ALLLIBS = ${LIBS} -lc -lrt
  +    endif
  +  else
  +    MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository
  +    PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XERCESCROOT}/.cxx_repository
  +    ifeq (${TRANSCODER}, ICU)
   	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc -licudata -lc -lrt
  -else
  +    else
   	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc -lrt
  -endif
  -SHLIBSUFFIX=.so
  +    endif
  +  endif
   endif
   
   ###################### STANDARD TOOLS #############################
  
  
  
  1.35      +8 -1      xml-xerces/c/src/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/runConfigure,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- runConfigure	2000/11/09 01:37:44	1.34
  +++ runConfigure	2001/02/08 14:15:33	1.35
  @@ -55,7 +55,7 @@
   # <http://www.apache.org/>.
   #
   #
  -# $Id: runConfigure,v 1.34 2000/11/09 01:37:44 andyh Exp $
  +# $Id: runConfigure,v 1.35 2001/02/08 14:15:33 tng Exp $
   #
   #
   
  @@ -422,6 +422,13 @@
   
   CFLAGS="$compileroptions $debugflag $transcodingDefines $msgloaderDefines $threadingDefines
$netaccessorDefines"
   export CFLAGS
  +
  +# gcc crashes if optimisation is turned on in a Tru64 environment
  +if [ $platform = "tru64" -a $CXX = "g++" ]; then
  +    CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]*//g'`
  +    CFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]*//g'`
  +    export CXXFLAGS CFLAGS
  +fi
   
   LDFLAGS="$linkeroptions"
   export LDFLAGS
  
  
  
  1.12      +4 -1      xml-xerces/c/src/util/XercesDefs.hpp
  
  Index: XercesDefs.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XercesDefs.hpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XercesDefs.hpp	2001/01/25 19:17:06	1.11
  +++ XercesDefs.hpp	2001/02/08 14:15:33	1.12
  @@ -56,6 +56,9 @@
   
   /*
    * $Log: XercesDefs.hpp,v $
  + * Revision 1.12  2001/02/08 14:15:33  tng
  + * enable COMPAQ Tru64 UNIX machines to build xerces-c with gcc (tested using COMPAQ gcc
version2.95.2 19991024 (release) and Tru64 V5.0 1094).  Added by Martin Kalen.
  + *
    * Revision 1.11  2001/01/25 19:17:06  tng
    * const should be used instead of static const.  Fixed by Khaled Noaman.
    *
  @@ -296,7 +299,7 @@
   #include	<util/Compilers/OS400SetDefs.hpp>
   #endif
   
  -#if defined(XML_TRU64)
  +#if defined(XML_DECCXX)
   #include	<util/Compilers/DECCXXDefs.hpp>
   #endif
   
  
  
  
  1.12      +5 -0      xml-xerces/c/src/util/Compilers/GCCDefs.hpp
  
  Index: GCCDefs.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/Compilers/GCCDefs.hpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- GCCDefs.hpp	2000/10/17 00:52:00	1.11
  +++ GCCDefs.hpp	2001/02/08 14:15:33	1.12
  @@ -56,6 +56,9 @@
   
   /*
    * $Log: GCCDefs.hpp,v $
  + * Revision 1.12  2001/02/08 14:15:33  tng
  + * enable COMPAQ Tru64 UNIX machines to build xerces-c with gcc (tested using COMPAQ gcc
version2.95.2 19991024 (release) and Tru64 V5.0 1094).  Added by Martin Kalen.
  + *
    * Revision 1.11  2000/10/17 00:52:00  andyh
    * Change XMLCh back to unsigned short on all platforms.
    *
  @@ -137,6 +140,7 @@
   // ---------------------------------------------------------------------------
   //  Provide some common string ops that are different/notavail on GCC
   // ---------------------------------------------------------------------------
  +#if !defined(XML_TRU64) && !defined(XML_GCC)
   inline char toupper(const char toUpper)
   {
       if ((toUpper >= 'a') && (toUpper <= 'z'))
  @@ -150,6 +154,7 @@
           return char(toLower + 0x20);
       return toLower;
   }
  +#endif
   
   int stricmp(const char* const str1, const char* const  str2);
   int strnicmp(const char* const str1, const char* const  str2, const unsigned int count);
  
  
  

Mime
View raw message