OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 22-Jul-2003 16:21:06
Branch: HEAD Handle: 2003072215210401
Added files:
openpkg-src/xerces-c xerces-c.patch.pth
Modified files:
openpkg-src/xerces-c xerces-c.spec
openpkg-web news.txt
Removed files:
openpkg-src/xerces-c xerces-c-pth.patch
Log:
use canonical filename for patch
Summary:
Revision Changes Path
1.4 +0 -109 openpkg-src/xerces-c/xerces-c-pth.patch
1.1 +109 -0 openpkg-src/xerces-c/xerces-c.patch.pth
1.20 +2 -2 openpkg-src/xerces-c/xerces-c.spec
1.5723 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
rm -f openpkg-src/xerces-c/xerces-c-pth.patch <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c-pth.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.patch.pth
============================================================================
$ cvs diff -u -r0 -r1.1 xerces-c.patch.pth
--- /dev/null 2003-07-22 16:21:05.000000000 +0200
+++ xerces-c.patch.pth 2003-07-22 16:21:05.000000000 +0200
@@ -0,0 +1,109 @@
+--- src/xercesc/runConfigure.dist 2003-05-27 17:04:47.000000000 +0200
++++ src/xercesc/runConfigure 2003-06-02 16:17:22.000000000 +0200
+@@ -189,6 +189,7 @@
+ linkeroptions="$linkeroptions $2"; shift 2;;
+
+ -P)
++ prefix=$2
+ configureoptions="$configureoptions --prefix=$2"; shift 2;;
+
+ -C)
+@@ -303,8 +304,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 = "netbsd"; then
+ threadingLibs="-pthread -lpthread"
+ threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+--- src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp.dist 2003-05-27
17:04:52.000000000 +0200
++++ src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp 2003-06-02
16:15:22.000000000 +0200
+@@ -113,8 +113,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
+@@ -506,6 +510,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);
+@@ -517,20 +529,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
+ }
+ }
+
+@@ -539,7 +555,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);
+@@ -552,7 +572,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);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 xerces-c.spec
--- openpkg-src/xerces-c/xerces-c.spec 8 Jul 2003 14:43:20 -0000 1.19
+++ openpkg-src/xerces-c/xerces-c.spec 22 Jul 2003 14:21:05 -0000 1.20
@@ -37,7 +37,7 @@
Group: Web
License: Apache Software License 1.1
Version: %{V_opkg}
-Release: 20030703
+Release: 20030722
# package options
%option with_pth no
@@ -53,7 +53,7 @@
# list of sources
Source0:
http://xml.apache.org/dist/xerces-c/stable/xerces-c-src_%{V_dist}.tar.gz
Patch0: xerces-c.patch
-Patch1: xerces-c-pth.patch
+Patch1: xerces-c.patch.pth
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5722 -r1.5723 news.txt
--- openpkg-web/news.txt 22 Jul 2003 13:49:12 -0000 1.5722
+++ openpkg-web/news.txt 22 Jul 2003 14:21:04 -0000 1.5723
@@ -1,3 +1,4 @@
+22-Jul-2003: Upgraded package: P<xerces-c-2.3.0-20030722>
22-Jul-2003: Upgraded package: P<pgp2-2.6.3i-20030722>
22-Jul-2003: Upgraded package: P<gcc2-2.95.3-20030722>
22-Jul-2003: Upgraded package: P<perl56-5.6.1-20030722>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
