Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a30483671a4389cf3041c1408022282d8e6e719e
commit a30483671a4389cf3041c1408022282d8e6e719e
Author: crazy <[EMAIL PROTECTED]>
Date: Mon Dec 10 05:04:52 2007 +0100
xerces-c-2.8.0-1-i686
* forgot to remove patches
* fixed SMP build
diff --git a/source/devel-extra/xerces-c/FrugalBuild
b/source/devel-extra/xerces-c/FrugalBuild
index 36ae457..0da8d03 100644
--- a/source/devel-extra/xerces-c/FrugalBuild
+++ b/source/devel-extra/xerces-c/FrugalBuild
@@ -10,13 +10,11 @@ depends=('libstdc++')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://xerces.apache.org/xerces-c/download.cgi|grep -om1
'xerces-c-src\(.*\).tar.gz'|sed 's/.*c_\(.*\).t.*/\1/;s/_/./g'"
-source=(http://netmirror.org/mirror/apache.org/xerces/c/sources/$pkgname-src_`echo
$pkgver|tr '.' '_'`.tar.gz \
- xerces-c-2.7.0-libpath.patch xerces-c-2.7.0-multilib.patch)
-sha1sums=('f0803b1330daec3f44b17dee64c3c99de6b3cd3e' \
- 'defaad81f4044b03aedc2d38da6e83725f5d0f61' \
- '6a9760ab87c309e401574b5bd6652a87b568f253')
+source=(http://netmirror.org/mirror/apache.org/xerces/c/sources/$pkgname-src_`echo
$pkgver|tr '.' '_'`.tar.gz)
+sha1sums=('f0803b1330daec3f44b17dee64c3c99de6b3cd3e')
build() {
+ unset MAKEFLAGS
export XERCESCROOT=$Fsrcdir/$pkgname-src_`echo $pkgver|tr '.' '_'`
Fcd $pkgname-src_`echo $pkgver|tr '.' '_'`
cd src/xercesc/ || Fdie
diff --git a/source/devel-extra/xerces-c/xerces-c-2.7.0-libpath.patch
b/source/devel-extra/xerces-c/xerces-c-2.7.0-libpath.patch
deleted file mode 100644
index 3d430ff..0000000
--- a/source/devel-extra/xerces-c/xerces-c-2.7.0-libpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- xerces-c-src/src/xercesc/Makefile.incl.orig 2006-01-08
20:05:35.000000000 -0500
-+++ xerces-c-src/src/xercesc/Makefile.incl 2006-01-08 20:08:19.000000000
-0500
-@@ -348,23 +348,23 @@
-
- ifeq (${BITSTOBUILD}, 64)
- ifeq (${TRANSCODER}, ICU)
-- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib
-L/usr/ccs/lib -licuuc -licudata
-+ ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
- else
-- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib
-L/usr/ccs/lib
-+ ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib
- endif
-
- ifeq (${MESSAGELOADER}, ICU)
-- ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib
-L/usr/ccs/lib -licuuc -licudata -lXercesMessages
-+ ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
-lXercesMessages
- endif
- else
- ifeq (${TRANSCODER}, ICU)
-- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-licuuc -licudata
-+ ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
- else
-- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-+ ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib
- endif
-
- ifeq (${MESSAGELOADER}, ICU)
-- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-licuuc -licudata -lXercesMessages
-+ ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
-lXercesMessages
- endif
- endif
-
diff --git a/source/devel-extra/xerces-c/xerces-c-2.7.0-multilib.patch
b/source/devel-extra/xerces-c/xerces-c-2.7.0-multilib.patch
deleted file mode 100644
index eca8109..0000000
--- a/source/devel-extra/xerces-c/xerces-c-2.7.0-multilib.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN
xerces-c-src.orig/obj/Makefile.in xerces-c-src/obj/Makefile.in
---- xerces-c-src.orig/obj/Makefile.in 2005-08-26 12:19:57.000000000 -0400
-+++ xerces-c-src/obj/Makefile.in 2005-10-04 12:01:33.000000000 -0400
-@@ -46,6 +46,7 @@
- include ../src/xercesc/Makefile.incl
-
- LIB=${XERCESCROOT}/lib
-+MLIBDIR=lib
- ## OS390BATCH
- ifeq (${OS390BATCH},1)
- BATCH_TARGET = "//'${LOADMOD}(IXM4C56)'"
-@@ -223,26 +224,26 @@
- ifeq (${OS390BATCH},1)
- @echo "Nothing to do for OS390BATCH ..."
- else
-- -mkdir -p ${DESTDIR}${PREFIX}/lib
-+ -mkdir -p ${DESTDIR}${PREFIX}/${MLIBDIR}
- ifeq (${PLATFORM}, CYGWIN)
- -mkdir -p ${DESTDIR}${PREFIX}/bin
- $(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
-- $(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; rm -f
libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
libxerces.dll.a)
-+ $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${DESTDIR}${PREFIX}/${MLIBDIR}
-+ (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_NAME}.a
libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
-
- $(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin
-- $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${DESTDIR}${PREFIX}/lib
-- (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a
libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s
${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
-+ $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${DESTDIR}${PREFIX}/${MLIBDIR}
-+ (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_DEPDOM}.a
libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s
${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
- else
-- $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
-- (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME}
${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
-+ $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR}
-+ (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_NAME}; ln -s
${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
-
-- $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
-- (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM}
${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})
-+ $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR}
-+ (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_DEPDOM}; ln -s
${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM}
${LINK_DEPDOM})
- endif
- ifeq (${PLATFORM},OS390)
-- $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
-- $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
-+ $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
-+ $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
- endif
- endif
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
