OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Jun-2003 17:10:36
Branch: HEAD Handle: 2003060216103202
Modified files:
openpkg-src/xerces-c xerces-c-pth.patch xerces-c.patch xerces-c.spec
openpkg-web news.txt
Log:
fix build process, EVAL again
Summary:
Revision Changes Path
1.3 +23 -23 openpkg-src/xerces-c/xerces-c-pth.patch
1.6 +21 -18 openpkg-src/xerces-c/xerces-c.patch
1.17 +5 -6 openpkg-src/xerces-c/xerces-c.spec
1.4687 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c-pth.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xerces-c-pth.patch
--- openpkg-src/xerces-c/xerces-c-pth.patch 11 Feb 2003 09:35:17 -0000 1.2
+++ openpkg-src/xerces-c/xerces-c-pth.patch 2 Jun 2003 15:10:34 -0000 1.3
@@ -1,5 +1,5 @@
---- src/xercesc/runConfigure.dist Mon Feb 10 15:30:59 2003
-+++ src/xercesc/runConfigure Mon Feb 10 15:36:55 2003
+--- 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;;
@@ -8,28 +8,28 @@
configureoptions="$configureoptions --prefix=$2"; shift 2;;
-C)
-@@ -301,8 +302,16 @@
+@@ -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 = "aix"; then
- aix_version=`./config.guess`;
- echo Found host system to be $aix_version
---- src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp.dist Mon Feb 10
15:31:14 2003
-+++ src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp Mon Feb 10
15:36:55 2003
-@@ -95,8 +95,12 @@
++ 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)
@@ -42,7 +42,7 @@
#ifndef _GNU_SOURCE
#error _GNU_SOURCE is not defined in your compile settings
-@@ -598,6 +602,14 @@
+@@ -506,6 +510,14 @@
void* XMLPlatformUtils::makeMutex()
{
@@ -57,7 +57,7 @@
pthread_mutex_t* mutex = new pthread_mutex_t;
pthread_mutexattr_t* attr = new pthread_mutexattr_t;
pthread_mutexattr_init(attr);
-@@ -609,20 +621,24 @@
+@@ -517,20 +529,24 @@
}
pthread_mutexattr_destroy(attr);
delete attr;
@@ -83,7 +83,7 @@
}
}
-@@ -631,7 +647,11 @@
+@@ -539,7 +555,11 @@
{
if (mtxHandle != NULL)
{
@@ -95,7 +95,7 @@
{
ThrowXML(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotLock);
-@@ -644,7 +664,11 @@
+@@ -552,7 +572,11 @@
{
if (mtxHandle != NULL)
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 xerces-c.patch
--- openpkg-src/xerces-c/xerces-c.patch 28 May 2003 14:47:01 -0000 1.5
+++ openpkg-src/xerces-c/xerces-c.patch 2 Jun 2003 15:10:34 -0000 1.6
@@ -1,31 +1,33 @@
---- obj/Makefile.in.dist Mon Feb 10 15:35:07 2003
-+++ obj/Makefile.in Tue Feb 11 10:46:55 2003
+--- obj/Makefile.in.dist 2003-05-27 17:04:32.000000000 +0200
++++ obj/Makefile.in 2003-06-02 16:27:08.000000000 +0200
@@ -1,4 +1,4 @@
-#
+
# The Apache Software License, Version 1.1
#
# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
-@@ -83,6 +83,9 @@
+@@ -83,6 +83,10 @@
include ../version.incl
include ../src/xercesc/Makefile.incl
+#override AR definition in Makefile.incl
+AR = @l_ar@
++RANLIB = @l_ranlib@
+
LIB=${XERCESCROOT}/lib
## OS390BATCH
ifeq (${OS390BATCH},1)
-@@ -121,7 +124,7 @@
+@@ -121,7 +125,8 @@
\rm -f $(DUMMYEXE)
$(DUMMYEXE): $(ALL_OBJECTS)
- ${MAKE_SHARED} -o [EMAIL PROTECTED] $^ $(PLATFORM_LIBRARIES) $(ALLLIBS)
+ ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
++ ${RANLIB} ${FQ_LINK_NAME:.so=.a}
###### End HP-UX CC compiler specific stuff #######
else
-@@ -164,14 +167,8 @@
+@@ -164,14 +169,9 @@
endif
${FQ_REAL_NAME}: $(ALL_OBJECTS)
@@ -39,10 +41,11 @@
- rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
+ @echo Building ${FQ_LINK_NAME:.so=.a}
+ ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
++ ${RANLIB} ${FQ_LINK_NAME:.so=.a} 2>/dev/null || true
## Start OS390 ##
ifeq (${PLATFORM},OS390)
-@@ -226,8 +223,7 @@
+@@ -226,8 +226,7 @@
$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${DESTDIR}${PREFIX}/lib
(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
else
@@ -52,8 +55,8 @@
endif
ifeq (${PLATFORM},OS390)
$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
---- samples/Makefile.incl.dist Mon Feb 10 16:47:03 2003
-+++ samples/Makefile.incl Tue Feb 11 09:23:20 2003
+--- samples/Makefile.incl.dist 2003-05-27 17:04:33.000000000 +0200
++++ samples/Makefile.incl 2003-06-02 16:25:06.000000000 +0200
@@ -71,8 +71,8 @@
endif
THISLIB=${LIB_DIR}/${LIBNAME}
@@ -124,7 +127,7 @@
EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
SHLIBSUFFIX=.so
endif
-@@ -204,7 +204,7 @@
+@@ -215,7 +215,7 @@
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D__${PLATFORM}__
LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
@@ -133,7 +136,7 @@
EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.dll
endif
-@@ -214,7 +214,7 @@
+@@ -225,7 +225,7 @@
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D${PLATFORM} -fPIC
LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
@@ -142,7 +145,7 @@
ifdef ICUROOT
PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
-@@ -299,7 +299,7 @@
+@@ -325,7 +325,7 @@
CMP= -c ${CXXFLAGS}
CC = ${COMPILER} -c -D${PLATFORM}
LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
@@ -151,7 +154,7 @@
SHLIBSUFFIX=.so
endif
-@@ -309,6 +309,6 @@
+@@ -335,6 +335,6 @@
CMP= -c ${CXXFLAGS}
CC= c++ -c -D${PLATFORM} -D_REENTRANT
LINK = c++ -D${PLATFORM} ${LDFLAGS}
@@ -159,8 +162,8 @@
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
SHLIBSUFFIX=.dylib
endif
---- tests/Makefile.incl.dist Mon Feb 10 16:46:44 2003
-+++ tests/Makefile.incl Tue Feb 11 09:33:34 2003
+--- tests/Makefile.incl.dist 2003-05-27 17:05:07.000000000 +0200
++++ tests/Makefile.incl 2003-06-02 16:25:06.000000000 +0200
@@ -71,8 +71,8 @@
endif
THISLIB=${LIB_DIR}/${LIBNAME}
@@ -231,7 +234,7 @@
EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
SHLIBSUFFIX=.so
endif
-@@ -203,7 +203,7 @@
+@@ -214,7 +214,7 @@
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D__${PLATFORM}__
LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
@@ -240,7 +243,7 @@
EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.dll
endif
-@@ -213,7 +213,7 @@
+@@ -224,7 +224,7 @@
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D${PLATFORM} -fPIC
LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
@@ -249,7 +252,7 @@
ifdef ICUROOT
PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
-@@ -298,7 +298,7 @@
+@@ -324,7 +324,7 @@
CMP= -c ${CXXFLAGS}
CC = ${COMPILER} -c -D${PLATFORM}
LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
@@ -258,7 +261,7 @@
SHLIBSUFFIX=.so
endif
-@@ -308,6 +308,6 @@
+@@ -334,6 +334,6 @@
CMP= -c ${CXXFLAGS}
CC= c++ -c -D${PLATFORM} -D_REENTRANT
LINK = c++ -D${PLATFORM} ${LDFLAGS}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 xerces-c.spec
--- openpkg-src/xerces-c/xerces-c.spec 31 May 2003 10:48:52 -0000 1.16
+++ openpkg-src/xerces-c/xerces-c.spec 2 Jun 2003 15:10:34 -0000 1.17
@@ -23,8 +23,6 @@
## SUCH DAMAGE.
##
-# FIXME: thl: flushed work, still does not build
-
# package version
%define V_opkg 2.3.0
%define V_dist 2_3_0
@@ -35,11 +33,11 @@
URL: http://xml.apache.org/xerces-c/
Vendor: Apache Software Foundation
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group: Web
License: Apache Software License 1.1
Version: %{V_opkg}
-Release: 20030531
+Release: 20030602
# package options
%option with_pth no
@@ -60,7 +58,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, gcc, make, autoconf, libtool
+BuildPreReq: OpenPKG, openpkg >= 20030103, gcc, make, autoconf
PreReq: OpenPKG, openpkg >= 20030103
%if "%{with_pth}" == "yes"
BuildPreReq: pth
@@ -84,7 +82,8 @@
( XERCESCROOT=`pwd`
export XERCESCROOT
%{l_shtool} subst \
- -e 's;@l_ar@;%{l_libtool} --tag=CXX --mode=link c++ -static -o;' \
+ -e 's;@l_ar@;ar cru;' \
+ -e 's;@l_ranlib@;ranlib;' \
obj/Makefile.in
cd $XERCESCROOT/src/xercesc
%if "%{with_cpp_namespace}" == "no"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4686 -r1.4687 news.txt
--- openpkg-web/news.txt 2 Jun 2003 13:53:55 -0000 1.4686
+++ openpkg-web/news.txt 2 Jun 2003 15:10:32 -0000 1.4687
@@ -1,3 +1,4 @@
+02-Jun-2003: Upgraded package: P<xerces-c-2.3.0-20030602>
02-Jun-2003: Upgraded package: P<xmlto-0.0.14-20030602>
02-Jun-2003: Upgraded package: P<bind8-8.4.0-20030602>
02-Jun-2003: Upgraded package: P<uvscan-4.1.6.4268-20030602>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
