make thread-support optional preliminary with_pth (patch supplied for FreeBSD only)

xerces-c/xerces-c-pth.patch

@@ -0,0 +1,109 @@
+--- src/xercesc/runConfigure.dist	Fri Dec 27 10:26:26 2002
++++ src/xercesc/runConfigure	Fri Dec 27 10:56:18 2002
+@@ -189,6 +189,7 @@
+         linkeroptions="$linkeroptions $2"; shift 2;;
+ 
+    -P)
++        prefix=$2
+         configureoptions="$configureoptions --prefix=$2"; shift 2;;
+ 
+    -C)
+@@ -301,8 +302,16 @@
+                ;;
+         esac
+     elif test $platform = "freebsd"; then
+-        threadingLibs="-pthread -lc_r"
+-        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
++        case $thread in
++            pth)
++                threadingLibs="-L$prefix/lib -lpth -lc_r"
++                threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS -DUSE_PTH -I$prefix/include"
++                ;;
++            *)
++                threadingLibs="-pthread -lc_r"
++                threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
++                ;;
++        esac
+     elif test $platform = "aix"; then
+         aix_version=`./config.guess`;
+         echo Found host system to be $aix_version
+--- src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp.dist	Tue Aug 27 09:24:36 2002
++++ src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp	Fri Dec 27 10:35:29 2002
+@@ -86,8 +86,12 @@
+ // ---------------------------------------------------------------------------
+ 
+ #if !defined(APP_NO_THREADS)
++#ifdef USE_PTH
++#include    <pth.h>
++#else
+ #include    <pthread.h>
+ #endif
++#endif
+ 
+ #ifndef _GNU_SOURCE
+     #error _GNU_SOURCE is not defined in your compile settings
+@@ -584,6 +588,14 @@
+ 
+ void* XMLPlatformUtils::makeMutex()
+ {
++#ifdef USE_PTH
++    pth_mutex_t* mutex = new pth_mutex_t;
++    if (pth_mutex_init(mutex))
++    {
++        ThrowXML(XMLPlatformUtilsException,
++                 XMLExcepts::Mutex_CouldNotCreate);
++    }
++#else
+     pthread_mutex_t* mutex = new pthread_mutex_t;
+     pthread_mutexattr_t*  attr = new pthread_mutexattr_t;
+     pthread_mutexattr_init(attr);
+@@ -595,20 +607,24 @@
+     }
+     pthread_mutexattr_destroy(attr);
+     delete attr;
++#endif
+     return (void*)(mutex);
+-
+ }
+ 
+ void XMLPlatformUtils::closeMutex(void* const mtxHandle)
+ {
+     if (mtxHandle != NULL)
+     {
++#ifdef USE_PTH
++        delete (pth_mutex_t*)mtxHandle;
++#else
+         if (pthread_mutex_destroy((pthread_mutex_t*) mtxHandle))
+         {
+             ThrowXML(XMLPlatformUtilsException,
+                      XMLExcepts::Mutex_CouldNotDestroy);
+         }
+         delete (pthread_mutex_t*)mtxHandle;
++#endif
+     }
+ }
+ 
+@@ -617,7 +633,11 @@
+ {
+     if (mtxHandle != NULL)
+     {
++#ifdef USE_PTH
++        if (pth_mutex_acquire((pth_mutex_t*) mtxHandle, FALSE, NULL))
++#else
+         if (pthread_mutex_lock((pthread_mutex_t*) mtxHandle))
++#endif
+         {
+             ThrowXML(XMLPlatformUtilsException,
+                      XMLExcepts::Mutex_CouldNotLock);
+@@ -630,7 +650,11 @@
+ {
+     if (mtxHandle != NULL)
+     {
++#ifdef USE_PTH
++        if (pth_mutex_release((pth_mutex_t*) mtxHandle))
++#else
+         if (pthread_mutex_unlock((pthread_mutex_t*) mtxHandle))
++#endif
+         {
+             ThrowXML(XMLPlatformUtilsException,
+                      XMLExcepts::Mutex_CouldNotUnlock);

xerces-c/xerces-c.spec

@@ -26,6 +26,9 @@
 %ifndef       with_pth
 %define       with_pth           no
 %endif
+%ifndef       with_threads
+%define       with_threads       no
+%endif
 
 %define       V_xerces           2.1.0
 %define       Vs_xerces          2_1_0
@@ -40,11 +43,16 @@ Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      Apache Software License 1.1
 Version:      %{V_xerces}
-Release:      20021209
+Release:      20021227
 
 #   list of sources
 Source0:      http://xml.apache.org/dist/xerces-c/stable/xerces-c-src%{Vs_xerces}.tar.gz
 Patch0:       xerces-c.patch
+Patch1:       xerces-c-pth.patch
+
+%if "%{with_pth}" == "yes"
+%define       with_threads       yes
+%endif
 
 #   build information
 Prefix:       %{l_prefix}
@@ -62,32 +70,54 @@ AutoReqProv:  no
     Xerces-C++ is a validating XML parser written in a portable subset of C++.
 
     Options:
+    --define 'with_threads'    %{with_threads}'
     --define 'with_pth         %{with_pth}'
 
 %prep
     %setup -q -n xerces-c-src%{Vs_xerces}
     %patch0 -p0
+%if "%{with_pth}" == "yes"
+    %patch1 -p0
+%endif
 
 %build
     rm -rf $RPM_BUILD_ROOT
-    ( XERCESCROOT=`pwd` ; \
+    ( XERCESCROOT=`pwd` ;
-      export XERCESCROOT ; \
+      export XERCESCROOT ;
       %{l_shtool} subst \
           -e 's;@l_ar@;%{l_libtool} --mode=link c++ -static -o;' \
           obj/Makefile.in
-      cd $XERCESCROOT/src/xercesc ; \
+      cd $XERCESCROOT/src/xercesc ;
-      autoconf ; \
+      autoconf ;
-      os="freebsd" ; \
+%if "%{with_threads}" == "yes"
-      pt="pthread" ; \
+      os="freebsd" ;
-      case "%{l_target}" in \
+      pt="pthread" ;
-          *-freebsd*)    os=freebsd ; pt=pthread ;; \
+      case "%{l_target}" in
-          *-linux*)      os=linux   ; pt=pthread ;; \
+%if "%{with_pth}" == "yes"
-          *-solaris*)    os=solaris ; pt=pthread ;; \
+          *-freebsd*)    os=freebsd ; pt=pth ;;
-          *-irix*)       os=irix    ; pt=sproc   ;; \
+%else
-          *-hpux-10.*)   os=hp-10   ; pt=none    ;; \
+          *-freebsd*)    os=freebsd ; pt=pthread ;;
-          *-hpux-11.*)   os=hp-11   ; pt=none    ;; \
+%endif
-          *-aix*)        os=aix     ; pt=pthread ;; \
+          *-linux*)      os=linux   ; pt=pthread ;;
-      esac ; \
+          *-solaris*)    os=solaris ; pt=pthread ;;
+          *-irix*)       os=irix    ; pt=sproc   ;;
+          *-hpux-10.*)   os=hp-10   ; pt=none    ;;
+          *-hpux-11.*)   os=hp-11   ; pt=none    ;;
+          *-aix*)        os=aix     ; pt=pthread ;;
+      esac ;
+%else
+      os="freebsd" ;
+      pt="none" ;
+      case "%{l_target}" in
+          *-freebsd*)    os=freebsd ;;
+          *-linux*)      os=linux   ;;
+          *-solaris*)    os=solaris ;;
+          *-irix*)       os=irix    ;;
+          *-hpux-10.*)   os=hp-10   ;;
+          *-hpux-11.*)   os=hp-11   ;;
+          *-aix*)        os=aix     ;;
+      esac ;
+%endif
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       LDFLAGS="%{l_ldflags}" \
@@ -99,15 +129,15 @@ AutoReqProv:  no
           -minmem \
           -nsocket \
           -tnative \
-          -r$pt ; \
+          -r$pt
-      %{l_make} %{l_mflags} \
+      %{l_make} %{l_mflags}
     )
 
 %install
-    ( XERCESCROOT=`pwd` ; \
+    ( XERCESCROOT=`pwd` ;
-      export XERCESCROOT ; \
+      export XERCESCROOT ;
-      cd $XERCESCROOT/src/xercesc ; \
+      cd $XERCESCROOT/src/xercesc ;
-      %{l_make} %{l_mflags} install "PREFIX=$RPM_BUILD_ROOT%{l_prefix}" ; \
+      %{l_make} %{l_mflags} install "PREFIX=$RPM_BUILD_ROOT%{l_prefix}"
     )
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}