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-Jan-2003 17:15:18
Branch: HEAD Handle: 2003010216151601
Modified files:
openpkg-src/xalan-c xalan-c.patch xalan-c.spec
openpkg-web news.txt
Log:
now build on all supported systems, thread-support option, analog to
xerces-c
Summary:
Revision Changes Path
1.2 +255 -23 openpkg-src/xalan-c/xalan-c.patch
1.5 +96 -26 openpkg-src/xalan-c/xalan-c.spec
1.2499 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xalan-c/xalan-c.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 xalan-c.patch
--- openpkg-src/xalan-c/xalan-c.patch 17 Dec 2002 16:54:14 -0000 1.1
+++ openpkg-src/xalan-c/xalan-c.patch 2 Jan 2003 16:15:17 -0000 1.2
@@ -1,5 +1,5 @@
--- c/src/Makefile.in.dist Thu Dec 12 13:14:03 2002
-+++ c/src/Makefile.in Fri Dec 13 11:06:53 2002
++++ c/src/Makefile.in Wed Dec 18 09:26:01 2002
@@ -143,8 +143,9 @@
ifeq ($(PLATFORM), LINUX)
@@ -20,6 +20,15 @@
PLATFORM_COMPILE_OPTIONS = -Wall
endif
+@@ -171,7 +172,7 @@
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION}
+- LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION}
++ LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
+
+ endif
+
@@ -184,6 +185,7 @@
PLATFORM_CXX_COMPILE_OPTIONS = +p -mt -Aa
ALLLIBS = ${LIBS}
@@ -130,7 +139,44 @@
CC1 = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = ${CC} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib
-@@ -435,13 +442,13 @@
+@@ -402,21 +409,29 @@
+
+ all: lib testXSLT testXPath XalanExe
+
++.PHONY: all
++
+ prepare:
+ @echo Preparing the directory structure for a build ...
+ -${MKDIR} -p ${ALL_OBJECTS_DIR}
+ -${MKDIR} -p ${LIB_DIR}
+ -${MKDIR} -p $(BINTARGETDIR)
+
++.PHONY: prepare
++
+ # Create header dependencies file -- this must be run before any objects are
+ # built
+ depend:
+ $(MAKE) -f makedepends DEPFILE=$(DEPFILE)
+
++.PHONY: depend
++
+ -include $(DEPFILE)
+
+ compile: $(ALL_OBJECTS)
+
++.PHONY: compile
++
+ ifeq ($(PLATFORM), AIX)
+ templates: ${ALL_OBJECTS_DIR}/XalanTemplate.o
+
+@@ -430,18 +445,20 @@
+ endif
+ endif
+
++.PHONY: templates
++
+ XalanExe: lib $(BINTARGETDIR)/Xalan
+
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -146,7 +192,7 @@
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -451,13 +458,13 @@
+@@ -451,13 +468,13 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -162,7 +208,7 @@
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -467,7 +474,7 @@
+@@ -467,7 +484,7 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -171,7 +217,7 @@
${ALL_OBJECTS_DIR}/TestXPath.o: $(TESTXPATH_DIR)/TestXPath.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o: $(TESTXPATH_DIR)/NodeNameTreeWalker.cpp
-@@ -475,7 +482,7 @@
+@@ -475,34 +492,44 @@
else
$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -180,7 +226,25 @@
${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -493,12 +500,12 @@
+
+ samples : Samples
+
++.PHONY: samples
++
+ tests : ThreadTest
+
++.PHONY: tests
++
+ Samples: lib CompileStylesheet DocumentBuilder ExternalFunction
ParsedSourceWrappers SimpleTransform SerializeNodeSet SimpleXPathAPI SimpleXPathCAPI
StreamTransform TraceListen UseStylesheetParam XalanTransform XalanTransformerCallback
XPathWrapper
+
++.PHONY: Samples
++
+ ApacheModuleXSLT: lib ${LIB_DIR}/mod_xslt$(SHLIBSUFFIX)
+
++.PHONY: ApacheModuleXSLT
++
+ ${LIB_DIR}/mod_xslt$(SHLIBSUFFIX) : ${ALL_OBJECTS_DIR}/mod_xslt.o
+ ifeq ($(PLATFORM), OS390)
$(MAKE_SHARED) $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ApacheModuleXSLT/%.c
@@ -196,7 +260,13 @@
endif
CompileStylesheet: lib $(BINTARGETDIR)/CompileStylesheet
-@@ -511,7 +518,7 @@
+
++.PHONY: CompileStyleSheet
++
+ $(BINTARGETDIR)/CompileStylesheet: ${ALL_OBJECTS_DIR}/CompileStylesheet.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -511,13 +538,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -205,7 +275,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/CompileStylesheet/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -526,7 +533,7 @@
+
+ DocumentBuilder: lib $(BINTARGETDIR)/DocumentBuilder
+
++.PHONY: DocumentBuilder
++
+ $(BINTARGETDIR)/DocumentBuilder: ${ALL_OBJECTS_DIR}/DocumentBuilder.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -526,13 +555,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -214,7 +292,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/DocumentBuilder/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -541,7 +548,7 @@
+
+ ExternalFunction: lib $(BINTARGETDIR)/ExternalFunction
+
++.PHONY: ExternalFunction
++
+ $(BINTARGETDIR)/ExternalFunction: ${ALL_OBJECTS_DIR}/ExternalFunction.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -541,13 +572,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -223,7 +309,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ExternalFunction/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -556,7 +563,7 @@
+
+ ParsedSourceWrappers: lib $(BINTARGETDIR)/ParsedSourceWrappers
+
++.PHONY: ParsedSourceWrappers
++
+ $(BINTARGETDIR)/ParsedSourceWrappers: ${ALL_OBJECTS_DIR}/ParsedSourceWrappers.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -556,13 +589,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -232,7 +326,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ParsedSourceWrappers/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -571,7 +578,7 @@
+
+ SerializeNodeSet: lib $(BINTARGETDIR)/SerializeNodeSet
+
++.PHONY: SerializeNodeSet
++
+ $(BINTARGETDIR)/SerializeNodeSet: ${ALL_OBJECTS_DIR}/SerializeNodeSet.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -571,13 +606,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -241,7 +343,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SerializeNodeSet/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -586,7 +593,7 @@
+
+ SimpleTransform: lib $(BINTARGETDIR)/SimpleTransform
+
++.PHONY: SimpleTransform
++
+ $(BINTARGETDIR)/SimpleTransform: ${ALL_OBJECTS_DIR}/SimpleTransform.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -586,13 +623,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -250,7 +360,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -601,7 +608,7 @@
+
+ SimpleXPathAPI: lib $(BINTARGETDIR)/SimpleXPathAPI
+
++.PHONY: SimpleXPathAPI
++
+ $(BINTARGETDIR)/SimpleXPathAPI: ${ALL_OBJECTS_DIR}/SimpleXPathAPI.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -601,13 +640,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -259,7 +377,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathAPI/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -616,7 +623,7 @@
+
+ SimpleXPathCAPI: lib $(BINTARGETDIR)/SimpleXPathCAPI
+
++.PHONY: SimpleXPathCAPI
++
+ $(BINTARGETDIR)/SimpleXPathCAPI: ${ALL_OBJECTS_DIR}/SimpleXPathCAPI.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -616,13 +657,15 @@
$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -268,7 +394,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -631,7 +638,7 @@
+
+ StreamTransform: lib $(BINTARGETDIR)/StreamTransform
+
++.PHONY: StreamTransform
++
+ $(BINTARGETDIR)/StreamTransform: ${ALL_OBJECTS_DIR}/StreamTransform.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -631,13 +674,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -277,7 +411,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/StreamTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -646,7 +653,7 @@
+
+ TraceListen: lib $(BINTARGETDIR)/TraceListen
+
++.PHONY: TraceListen
++
+ $(BINTARGETDIR)/TraceListen: ${ALL_OBJECTS_DIR}/TraceListen.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -646,13 +691,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -286,7 +428,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TraceListen/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -661,7 +668,7 @@
+
+ UseStylesheetParam: lib $(BINTARGETDIR)/UseStylesheetParam
+
++.PHONY: UseStyleSheetParam
++
+ $(BINTARGETDIR)/UseStylesheetParam: ${ALL_OBJECTS_DIR}/UseStylesheetParam.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -661,13 +708,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -295,7 +445,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/UseStylesheetParam/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -676,7 +683,7 @@
+
+ XalanTransform: lib $(BINTARGETDIR)/XalanTransform
+
++.PHONY: XalanTransform
++
+ $(BINTARGETDIR)/XalanTransform: ${ALL_OBJECTS_DIR}/XalanTransform.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -676,13 +725,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -304,7 +462,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -691,7 +698,7 @@
+
+ XalanTransformerCallback: lib $(BINTARGETDIR)/XalanTransformerCallback
+
++.PHONY: XalanTransformerCallback
++
+ $(BINTARGETDIR)/XalanTransformerCallback:
${ALL_OBJECTS_DIR}/XalanTransformerCallback.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -691,13 +742,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -313,7 +479,15 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransformerCallback/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -706,7 +713,7 @@
+
+ XPathWrapper: lib $(BINTARGETDIR)/XPathWrapper
+
++.PHONY: XPathWrapper
++
+ $(BINTARGETDIR)/XPathWrapper: ${ALL_OBJECTS_DIR}/XPathWrapper.o
${ALL_OBJECTS_DIR}/TestDriver.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -706,15 +759,19 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -322,7 +496,19 @@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XPathWrapper/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -723,7 +730,7 @@
+
+ Tests: lib ThreadTest Conf
+
++.PHONY: Tests
++
+ ThreadTest: lib $(BINTARGETDIR)/ThreadTest
+
++.PHONY: ThreadTest
++
+ $(BINTARGETDIR)/ThreadTest: ${ALL_OBJECTS_DIR}/ThreadTest.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -723,13 +780,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -331,7 +517,24 @@
${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -759,15 +766,15 @@
+
+ Harness : lib ${ALL_OBJECTS_DIR}/XMLFileReporter.o ${ALL_OBJECTS_DIR}/FileUtility.o
+
++.PHONY: Harness
++
+ ${ALL_OBJECTS_DIR}/FileUtility.o:
+ ifeq ($(PLATFORM), OS390)
+ ${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
+@@ -751,6 +810,8 @@
+
+ Conf: Harness $(BINTARGETDIR)/Conf
+
++.PHONY: Conf
++
+ $(BINTARGETDIR)/Conf: ${ALL_OBJECTS_DIR}/conf.o ${ALL_OBJECTS_DIR}/FileUtility.o
${ALL_OBJECTS_DIR}/XMLFileReporter.o
+ ifeq ($(PLATFORM), OS390)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+@@ -759,15 +820,17 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
@@ -343,6 +546,8 @@
-lib: prepare compile $(THISLIB)$(VER)$(SHLIBSUFFIX)
+lib: prepare compile $(THISLIB)$(LIBSUFFIX)
++
++.PHONY: lib
-$(THISLIB)$(VER)$(SHLIBSUFFIX): $(ALL_OBJECTS)
- $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS) $^ -o $@
@@ -351,7 +556,7 @@
ifeq ($(PLATFORM), OS390)
cp -p *.x ${LIB_DIR}
endif
-@@ -779,6 +786,7 @@
+@@ -779,6 +842,7 @@
rm -rf $(XALANCROOT)/src/so_locations
endif
rm -f $(THISLIB)$(VER)$(SHLIBSUFFIX)
@@ -359,3 +564,30 @@
rm -f $(THISLIB)$(VER).map1
rm -f $(BINTARGETDIR)/testXSLT
rm -f $(BINTARGETDIR)/testXPath
+@@ -798,3 +862,6 @@
+ rm -f $(BINTARGETDIR)/XalanTransform
+ rm -f $(BINTARGETDIR)/XalanTransformerCallback
+ rm -f $(BINTARGETDIR)/XPathWrapper
++
++.PHONY: clean
++
+--- c/src/XPath/XPathExpression.hpp.dist Wed Jun 26 03:20:01 2002
++++ c/src/XPath/XPathExpression.hpp Fri Dec 27 14:36:49 2002
+@@ -794,7 +794,7 @@
+ }
+ else
+ {
+- assert(theSize == OpCodeMapValueType(theSize));
++ assert(theSize ==
(OpCodeMapSizeType)OpCodeMapValueType(theSize));
+
+ return OpCodeMapValueType(theSize);
+ }
+@@ -863,7 +863,7 @@
+ {
+ assert(opPos < opCodeMapSize());
+
+- assert(opPos + m_opMap[opPos + s_opCodeMapLengthIndex] ==
OpCodeMapValueType(opPos + m_opMap[opPos + s_opCodeMapLengthIndex]));
++ assert(opPos + m_opMap[opPos + s_opCodeMapLengthIndex] ==
(OpCodeMapSizeType)OpCodeMapValueType(opPos + m_opMap[opPos +
s_opCodeMapLengthIndex]));
+
+ return OpCodeMapValueType(opPos + m_opMap[opPos +
s_opCodeMapLengthIndex]);
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xalan-c/xalan-c.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 xalan-c.spec
--- openpkg-src/xalan-c/xalan-c.spec 30 Dec 2002 22:07:41 -0000 1.4
+++ openpkg-src/xalan-c/xalan-c.spec 2 Jan 2003 16:15:17 -0000 1.5
@@ -23,8 +23,12 @@
## SUCH DAMAGE.
##
-%define V_xalan 1.4
-%define Vs_xalan 1_4
+# package version
+%define V_opkg 1.4
+%define V_dist 1_4
+
+# package options
+%option with_threads no
# package information
Name: xalan-c
@@ -35,17 +39,18 @@
Distribution: OpenPKG [EVAL]
Group: Web
License: Apache Software License 1.1
-Version: %{V_xalan}
-Release: 20021206
+Version: %{V_opkg}
+Release: 20030102
# list of sources
-Source0: http://xml.apache.org/dist/xalan-c/Xalan-C_%{Vs_xalan}-src.tar.gz
+Source0: http://xml.apache.org/dist/xalan-c/Xalan-C_%{V_dist}-src.tar.gz
+Patch0: xalan-c.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021120, autoconf, gcc, make, xerces-c >= 2.1.0
-PreReq: OpenPKG, openpkg >= 20021120, xerces-c >= 2.1.0
+BuildPreReq: OpenPKG, openpkg >= 20020206, autoconf, gcc, make, xerces-c >= 2.1.0
+PreReq: OpenPKG, openpkg, xerces-c >= 2.1.0
AutoReq: no
AutoReqProv: no
@@ -57,35 +62,100 @@
%prep
%setup -q -n xml-xalan
+ %patch0 -p0
%build
rm -rf $RPM_BUILD_ROOT
- ( XALANCROOT=`pwd` ; \
- XERCESCROOT=%{l_prefix} ; \
- export XALANCROOT XERCESCROOT ; \
- cd c/src ; \
- pf=LINUX; \
- case "%{l_target}" in \
- *-freebsd*) pf=LINUX ;; \
- *-linux*) pf=LINUX ;; \
- *-hpux*) pf=HPUX ;; \
- *-solaris*) pf=SOLARIS ;; \
- *-aix*) pf=AIX ;; \
- esac ; \
- CC="%{l_cc}" \
+ ( XALANCROOT=`pwd` ;
+ XERCESCROOT=%{l_prefix} ;
+ export XALANCROOT XERCESCROOT ;
+ cd c/src ;
+ %{l_shtool} subst \
+ -e 's;@l_ar@;%{l_libtool} --mode=link c++ -static -o;' \
+ Makefile.in ;
+ pf=LINUX;
+ cf="";
+ lf="";
+%if "%{with_threads}" == "yes"
+ case "%{l_target}" in
+ *-freebsd*) pf=LINUX
+ cf="-pthread"
+ lf=""
+ ;;
+ *-linux*) pf=LINUX
+ cf="-pthread"
+ lf=""
+ ;;
+ *-hpux*) pf=LINUX
+ cf="-pthread"
+ lf=""
+ ;;
+ *-solaris*) pf=LINUX
+ cf=""
+ lf="-lpthread -lsocket -lnsl"
+ ;;
+ *-aix*) pf=AIX;
+ cf="-pthread"
+ lf=""
+ ;;
+ esac ;
+%else
+ case "%{l_target}" in
+ *-freebsd*) pf=LINUX
+ cf=""
+ lf=""
+ ;;
+ *-linux*) pf=LINUX
+ cf=""
+ lf=""
+ ;;
+ *-hpux*) pf=LINUX
+ cf=""
+ lf=""
+ ;;
+ *-solaris*) pf=LINUX
+ cf=""
+ lf="-lsocket -lnsl"
+ ;;
+ *-aix*) pf=AIX;
+ cf=""
+ lf=""
+ ;;
+ esac ;
+%endif
+ CC="%{l_cc} $cf" \
+ CXX="%{l_cxx} $cf" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags} $lf" \
./configure \
--prefix=%{l_prefix} ; \
- %{l_make} %{l_mflags -O} PLATFORM="$pf" \
+ %{l_make} %{l_mflags} PLATFORM="$pf"
)
%install
- ( XALANCROOT=`pwd` ; \
- export XALANCROOT ; \
- cd c/src ; \
- %{l_make} %{l_mflags} install "PREFIX=$RPM_BUILD_ROOT%{l_prefix}"
+ %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
+ %{l_shtool} install -c -s -m 755 \
+ bin/Xalan $RPM_BUILD_ROOT%{l_prefix}/bin
+ %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/lib
+ %{l_shtool} install -c -m 644 \
+ lib/libxalan-c.a $RPM_BUILD_ROOT%{l_prefix}/lib
+ %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/share/xalan-c
+ ( cd c
+ for f in `find samples xdocs -type d \( -name CVS -prune -o -print \)`; do
+ %{l_shtool} mkdir -m 755 $RPM_BUILD_ROOT%{l_prefix}/share/xalan-c/$f
+ done
+ for f in `find samples xdocs -type d -name CVS -prune -o -type f -print`; do
+ %{l_shtool} install -c -m 644 \
+ $f $RPM_BUILD_ROOT%{l_prefix}/share/xalan-c/
+ done
+ cd src
+ for f in */*.hpp ; do
+ %{l_shtool} mkdir -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/include/xalan/`dirname $f`
+ %{l_shtool} install -c -m 644 \
+ $f $RPM_BUILD_ROOT%{l_prefix}/include/xalan/
+ done
)
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2498 -r1.2499 news.txt
--- openpkg-web/news.txt 2 Jan 2003 14:36:13 -0000 1.2498
+++ openpkg-web/news.txt 2 Jan 2003 16:15:16 -0000 1.2499
@@ -1,3 +1,4 @@
+02-Jan-2003: Upgraded package: P<xalan-c-1.4-20030102>
02-Jan-2003: Upgraded package: P<mico-2.3.7-20030102>
02-Jan-2003: Upgraded package: P<mysql-3.23.54a-20021231>
02-Jan-2003: Upgraded package: P<openpkg-tool-20030102-20030102>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
