Sat Aug 20 23:14:32 UTC 2011

2 files changed, 81 insertions, 14 deletions

diff --git a/community/xalan-c/1.11.0_pre797991-parallel-build.patch b/community/xalan-c/1.11.0_pre797991-parallel-build.patch
new file mode 100644
index 000000000..46d9659b0
--- /dev/null
+++ b/community/xalan-c/1.11.0_pre797991-parallel-build.patch
@@ -0,0 +1,62 @@
+diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan.orig//c/src/xalanc/Makefile.in	2010-02-23 10:51:30.058353490 +0100
++++ xml-xalan/c/src/xalanc/Makefile.in	2010-02-23 10:52:53.251679288 +0100
+@@ -84,6 +84,10 @@
+ SAMPLES_DIR = ${XALANCROOT}/samples
+ TESTS_DIR = ${XALANCROOT}/Tests
+ 
++TESTXSLT_OBJS = ${XSL_OBJ_DIR}/process.o
++XALANEXE_OBJS = ${XSL_OBJ_DIR}/XalanExe.o
++TESTXPATH_OBJS = ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
++
+ ALL_VPATH_CPP = \
+ $(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
+ $(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
+@@ -169,6 +173,9 @@
+ 
+ compile:	 $(ALL_OBJECTS) 
+ 
++$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale
++locale: prepare
++
+ ifeq (${OS390BATCH},1)
+ XalanExe: lib  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
+ 
+@@ -188,28 +195,28 @@
+ 
+ else # Not OS390BATCH
+ 
+-XalanExe: lib  $(XSL_BIN_DIR)/Xalan
++XalanExe: $(XSL_BIN_DIR)/Xalan
+ 
+-$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
++$(XSL_BIN_DIR)/Xalan: lib ${XALANEXE_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} ${XALANEXE_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ endif
+ 
+-testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
++testXSLT: $(XSL_BIN_DIR)/testXSLT
+ 
+-$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
++$(XSL_BIN_DIR)/testXSLT: lib ${TESTXSLT_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} ${TESTXSLT_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+-testXPath: lib  $(XSL_BIN_DIR)/testXPath
++testXPath: $(XSL_BIN_DIR)/testXPath
+ 
+-$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
++$(XSL_BIN_DIR)/testXPath: lib ${TESTXPATH_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${TESTXPATH_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
diff --git a/community/xalan-c/PKGBUILD b/community/xalan-c/PKGBUILD
index 2de7fb30b..c73848fca 100644
--- a/community/xalan-c/PKGBUILD
+++ b/community/xalan-c/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 11866 2010-02-20 10:45:04Z dgriffiths $
+# $Id: PKGBUILD 54514 2011-08-19 14:55:46Z ibiru $
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=xalan-c
-pkgver=1.11_pre797991
-pkgrel=2
+pkgver=1.11_pre1153059
+pkgrel=1
 pkgdesc="A XSLT processor for transforming XML documents"
 arch=('i686' 'x86_64')
 url="http://xml.apache.org/xalan-c"
 license=('APACHE')
 depends=('xerces-c')
-options=('!makeflags')
-#source=(http://www.axint.net/apache/xml/xalan-c/source/Xalan-C_1_10_0-src.tar.gz)
-source=(http://mirrors.kernel.org/gentoo/distfiles/Xalan-C_r797991-src.tar.gz
-	1.11.0_pre797991-as-needed.patch  1.11.0_pre797991-bugfixes.patch)
+source=(http://mirrors.kernel.org/gentoo/distfiles/Xalan-C_r1153059-src.tar.gz
+	1.11.0_pre797991-as-needed.patch
+        1.11.0_pre797991-bugfixes.patch
+        1.11.0_pre797991-parallel-build.patch)
+md5sums=('98ea8584ccdbb9044757dda725f780bf'
+         '7040fb617e26fbdadc423948d3a23558'
+         'fe7af1f3a9e02ad813481f0e1a84f16c'
+         '633b4ab702cb0ea0cf1010cadef7ac4c')
 
 build() {
   export XALANCROOT=${srcdir}/xml-xalan/c
-  unset LDFLAGS
 
   cd ${srcdir}/xml-xalan/c
-  patch -Np2 -i ${srcdir}/1.11.0_pre797991-as-needed.patch || return 1
-  patch -Np2 -i ${srcdir}/1.11.0_pre797991-bugfixes.patch || return 1
+  patch -Np2 -i ${srcdir}/1.11.0_pre797991-as-needed.patch
+  patch -Np2 -i ${srcdir}/1.11.0_pre797991-bugfixes.patch
+  patch -Np2 -i ${srcdir}/1.11.0_pre797991-parallel-build.patch
 
   ./runConfigure -p linux -c gcc -x g++ -P/usr
   #./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/xml-xalan/c
   make DESTDIR=${pkgdir} install
 }
-md5sums=('cc54971e92f308bcc326f4bba542eeeb'
-         '7040fb617e26fbdadc423948d3a23558'
-         'fe7af1f3a9e02ad813481f0e1a84f16c')