OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-May-2003 16:47:01
Branch: HEAD Handle: 2003052815470100
Modified files:
openpkg-src/xerces-c xerces-c.patch xerces-c.spec
Log:
flush pendig work; still does not build
Summary:
Revision Changes Path
1.5 +5 -32 openpkg-src/xerces-c/xerces-c.patch
1.15 +6 -6 openpkg-src/xerces-c/xerces-c.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 xerces-c.patch
--- openpkg-src/xerces-c/xerces-c.patch 11 Feb 2003 10:33:20 -0000 1.4
+++ openpkg-src/xerces-c/xerces-c.patch 28 May 2003 14:47:01 -0000 1.5
@@ -25,14 +25,16 @@
###### End HP-UX CC compiler specific stuff #######
else
-@@ -164,12 +167,8 @@
+@@ -164,14 +167,8 @@
endif
${FQ_REAL_NAME}: $(ALL_OBJECTS)
- @echo Building ${FQ_REAL_NAME}
- ${MAKE_SHARED} ${LD_SONAME} -o [EMAIL PROTECTED] ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
-- @echo symlink ${FQ_SO_NAME}
+- ifneq (${FQ_SO_NAME},${FQ_REAL_NAME})
+- @echo symlink ${FQ_SO_NAME}
- rm -rf ${FQ_SO_NAME} && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
+- endif
- @echo symlink ${FQ_LINK_NAME}
- rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
+ @echo Building ${FQ_LINK_NAME:.so=.a}
@@ -40,7 +42,7 @@
## Start OS390 ##
ifeq (${PLATFORM},OS390)
-@@ -224,8 +223,7 @@
+@@ -226,8 +223,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
@@ -264,32 +266,3 @@
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
SHLIBSUFFIX=.dylib
endif
---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.dist Mon
Feb 10 15:31:26 2003
-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp Mon Feb 10
15:37:22 2003
-@@ -103,8 +103,6 @@
- # include <errno.h>
- # include <machine/endian.h>
-
--XERCES_CPP_NAMESPACE_BEGIN
--
- // ---------------------------------------------------------------------------
- // Description of encoding schemas, supported by iconv()
- // ---------------------------------------------------------------------------
-@@ -209,6 +207,8 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+XERCES_CPP_NAMESPACE_BEGIN
-+
- // ---------------------------------------------------------------------------
- // Local, const data
- // ---------------------------------------------------------------------------
-@@ -1563,6 +1563,7 @@
- return (rc != (size_t)-1) && (len == 0);
- }
-
-+#endif /* XML_USE_LIBICONV */
-+
- XERCES_CPP_NAMESPACE_END
-
--#endif /* XML_USE_LIBICONV */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 xerces-c.spec
--- openpkg-src/xerces-c/xerces-c.spec 8 Apr 2003 15:43:13 -0000 1.14
+++ openpkg-src/xerces-c/xerces-c.spec 28 May 2003 14:47:01 -0000 1.15
@@ -24,8 +24,8 @@
##
# package version
-%define V_opkg 2.2.0
-%define V_dist 2_2_0
+%define V_opkg 2.3.0
+%define V_dist 2_3_0
# package information
Name: xerces-c
@@ -37,7 +37,7 @@
Group: Web
License: Apache Software License 1.1
Version: %{V_opkg}
-Release: 20030408
+Release: 20030528
# package options
%option with_pth no
@@ -51,7 +51,7 @@
%endif
# list of sources
-Source0:
http://xml.apache.org/dist/xerces-c/stable/xerces-c-src%{V_dist}.tar.gz
+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
@@ -71,7 +71,7 @@
Xerces-C++ is a validating XML parser written in a portable subset of C++.
%prep
- %setup -q -n xerces-c-src%{V_dist}
+ %setup -q -n xerces-c-src_%{V_dist}
%patch0 -p0
%if "%{with_pth}" == "yes"
%patch1 -p0
@@ -82,7 +82,7 @@
( XERCESCROOT=`pwd`
export XERCESCROOT
%{l_shtool} subst \
- -e 's;@l_ar@;%{l_libtool} --mode=link c++ -static -o;' \
+ -e 's;@l_ar@;%{l_libtool} --tag=CXX --mode=link c++ -static -o;' \
obj/Makefile.in
cd $XERCESCROOT/src/xercesc
%if "%{with_cpp_namespace}" == "no"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
