downgrade to JUNK

xalan-c/xalan-c.patch

@@ -1,6 +1,15 @@
---- c/src/Makefile.in.dist	Thu Dec 12 13:14:03 2002
-+++ c/src/Makefile.in	Tue Jan  7 14:17:08 2003
-@@ -143,8 +143,9 @@
+--- c/src/Makefile.in.dist	2003-03-20 21:15:54.000000000 +0100
++++ c/src/Makefile.in	2003-06-02 17:57:31.000000000 +0200
+@@ -68,6 +68,8 @@
+ 
+ #MACROS defining commands
+ MKDIR=mkdir
++AR=@l_ar@
++RANLIB=@l_ranlib@
+ 
+ ifndef XALANCROOT 
+ noxalanroot:
+@@ -151,8 +153,9 @@
  ifeq ($(PLATFORM), LINUX)
  
    SUPPORTED = TRUE
@@ -11,7 +20,7 @@
    PIC_OPTION=
  
    ifeq (${CXX}, icpc)
-@@ -154,7 +155,7 @@
+@@ -162,7 +165,7 @@
  
    else
  
@@ -20,7 +29,7 @@
      PLATFORM_COMPILE_OPTIONS = -Wall
  
    endif
-@@ -171,7 +172,7 @@
+@@ -179,7 +182,7 @@
    CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
    CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
    MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION}
@@ -29,7 +38,7 @@
  
  endif
  
-@@ -184,6 +185,7 @@
+@@ -192,6 +195,7 @@
    PLATFORM_CXX_COMPILE_OPTIONS = +p -mt -Aa
    ALLLIBS = ${LIBS}
    SHLIBSUFFIX=.sl
@@ -37,18 +46,16 @@
    CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
    CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
    MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s
-@@ -199,8 +201,8 @@
+@@ -207,7 +211,7 @@
  
    ifeq (${CXX}, g++)
  
--	PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
--	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
-+	PLATFORM_COMPILE_OPTIONS = -instances=static -D${PLATFORM} -D_REENTRANT
-+	ALLLIBS = ${LIBS}
+-	PLATFORM_COMPILE_OPTIONS = -Wall -fPIC -D${PLATFORM} -D_REENTRANT
++	PLATFORM_COMPILE_OPTIONS = -Wall -D${PLATFORM} -D_REENTRANT
  
  	ifdef XALAN_USE_ICU
  	LD_RPATH_PRE=  -Wl,-rpath,
-@@ -209,10 +211,10 @@
+@@ -216,10 +220,10 @@
  	EXTRA_LINK_OPTIONS=-lc
  	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
      CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
@@ -60,9 +67,9 @@
 -	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
 +	ALLLIBS = ${LIBS}
  
-     PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib $(LD_RPATH_PRE)${ICUI18NROOT}/lib
+   else
  
-@@ -231,6 +233,7 @@
+@@ -236,6 +240,7 @@
    endif
  
    SHLIBSUFFIX=.so
@@ -70,46 +77,36 @@
  
  endif
  
-@@ -241,8 +244,8 @@
+@@ -246,16 +251,15 @@
  
    ifeq (${CXX}, g++)
  
--	PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
+-	PLATFORM_COMPILE_OPTIONS = -Wall -fPIC -D${PLATFORM} -D_REENTRANT
 -	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
-+	PLATFORM_COMPILE_OPTIONS = -instances=static -D${PLATFORM} -D_REENTRANT
-+	ALLLIBS = ${LIBS}
++	PLATFORM_COMPILE_OPTIONS = -Wall -D${PLATFORM} -D_REENTRANT
  
- 	ifdef XALAN_USE_ICU
- 	LD_RPATH_PRE=  -Wl,-rpath,
-@@ -252,15 +255,15 @@
  	EXTRA_LINK_OPTIONS=-lc
  	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
      CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
 -	MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
 -	LINK =  g++ -D${PLATFORM} -fPIC
-+	MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared 
-+	LINK =  g++ -D${PLATFORM} 
++	MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared
++	LINK =  g++ -D${PLATFORM}
  
 -	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
 +	ALLLIBS = ${LIBS}
  
-   else
+     SHLIBSUFFIX=.a
  
- 	PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_THREAD_SAFE
--	ALLLIBS = ${LIBS} -L/usr/lib 
-+	ALLLIBS = ${LIBS}
- 	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
- ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
- 	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG -I${STLPORTROOT}/stlport
-@@ -276,6 +279,7 @@
-   endif
+@@ -282,6 +286,7 @@
+ endif
  
-   SHLIBSUFFIX=.a
-+  LIBSUFFIX=.a
+ 	SHLIBSUFFIX=.so
++	LIBSUFFIX=.a
  
- endif
+   endif
  
-@@ -288,6 +292,7 @@
+@@ -296,6 +301,7 @@
    PLATFORM_COMPILE_OPTIONS2 =-Wc,dll -W0,"langlvl(extended),notempinc,float(ieee),targ(osv2r8)" -D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
    ALLLIBS =
    SHLIBSUFFIX=.dll
@@ -117,7 +114,7 @@
    OS390SIDEDECK=.x
  
    CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)  -I${STLPORTROOT}/stlport
-@@ -309,8 +314,9 @@
+@@ -317,8 +323,9 @@
  
    SUPPORTED = TRUE
    PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${ALL_OBJECTS_DIR}/.cxx_repository -ieee -pthread -std strict_ansi_errors
@@ -128,10 +125,10 @@
    CC1 = $(CXX) ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS) -nocxxstd
    CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
    MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr ${ALL_OBJECTS_DIR}/.cxx_repository -ieee -pthread -std strict_ansi_errors -nocxxstd
-@@ -324,8 +330,9 @@
+@@ -332,8 +339,9 @@
  
    SUPPORTED = TRUE
-   PLATFORM_COMPILE_OPTIONS = -Wall -D${PLATFORM} -D_REENTRANT -DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
+   PLATFORM_COMPILE_OPTIONS = -Wall -fno-elide-constructors -D${PLATFORM} -D_REENTRANT -DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
 -  ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib
 +  ALLLIBS = ${LIBS}
    SHLIBSUFFIX=.dylib
@@ -139,7 +136,7 @@
    CC1 = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
    CC4 = ${CC} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
    MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib
-@@ -402,21 +409,29 @@
+@@ -421,21 +429,29 @@
  
  all:	 lib  testXSLT testXPath XalanExe
  
@@ -169,7 +166,7 @@
  ifeq ($(PLATFORM), AIX)
  templates: ${ALL_OBJECTS_DIR}/XalanTemplate.o
  
-@@ -430,18 +445,20 @@
+@@ -449,18 +465,20 @@
  endif
  endif
  
@@ -194,7 +191,7 @@
  ${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
  	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  endif
-@@ -449,15 +466,15 @@
+@@ -468,15 +486,15 @@
  testXSLT: lib  $(BINTARGETDIR)/testXSLT
  
  ifeq ($(PLATFORM), OS390)                                                       
@@ -214,7 +211,7 @@
  ${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
  	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  endif
-@@ -465,44 +482,54 @@
+@@ -484,47 +502,57 @@
  testXPath: lib  $(BINTARGETDIR)/testXPath
  
  ifeq ($(PLATFORM), OS390)                                                       
@@ -222,7 +219,7 @@
 +$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o lib
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
 -	${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
-+	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o -o $@	$(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) 
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
  ${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
@@ -232,20 +229,23 @@
 +$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o lib
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
 -	${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
-+	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o -o $@	-L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) 
++	${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
  ${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
  	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  endif
  
  samples : Samples
  
-+.PHONY: samples
++.PHONY: samles
 +
  tests : ThreadTest
  
 +.PHONY: tests
 +
- Samples: lib CompileStylesheet DocumentBuilder ExternalFunction ParsedSourceWrappers SimpleTransform SerializeNodeSet SimpleXPathAPI SimpleXPathCAPI StreamTransform TraceListen UseStylesheetParam XalanTransform XalanTransformerCallback XPathWrapper
+ Samples: lib CompileStylesheet DocumentBuilder ExternalFunction ParsedSourceWrappers \
+          SimpleTransform SerializeNodeSet SimpleXPathAPI SimpleXPathCAPI StreamTransform \
+ 		 TraceListen TransformToXercesDOM UseStylesheetParam XalanTransform \
+ 		 XalanTransformerCallback XPathWrapper
  
 +.PHONY: Samples
 +
@@ -276,7 +276,7 @@
  $(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 @@
+@@ -533,13 +561,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -293,7 +293,7 @@
  $(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 @@
+@@ -548,13 +578,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -310,7 +310,7 @@
  $(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 @@
+@@ -563,13 +595,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -327,7 +327,7 @@
  $(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 @@
+@@ -578,13 +612,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -344,7 +344,7 @@
  $(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 @@
+@@ -593,13 +629,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -361,7 +361,7 @@
  $(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 @@
+@@ -608,13 +646,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -378,7 +378,7 @@
  $(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 @@
+@@ -623,13 +663,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -395,7 +395,7 @@
  $(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 @@
+@@ -638,13 +680,15 @@
  	$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -412,7 +412,7 @@
  $(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 @@
+@@ -653,13 +697,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -429,7 +429,7 @@
  $(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 @@
+@@ -668,7 +714,7 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -438,6 +438,15 @@
  ${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TraceListen/%.cpp
  	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
  endif
+@@ -683,13 +729,15 @@
+ 	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
+ else
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
+-	${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
++	${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
+ ${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TransformToXercesDOM/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
+ endif
  
  UseStylesheetParam: lib $(BINTARGETDIR)/UseStylesheetParam
  
@@ -446,7 +455,7 @@
  $(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 @@
+@@ -698,13 +746,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<	
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -463,7 +472,7 @@
  $(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 @@
+@@ -713,13 +763,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -480,7 +489,7 @@
  $(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 @@
+@@ -728,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} \
@@ -497,7 +506,7 @@
  $(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 @@
+@@ -743,15 +797,19 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -518,7 +527,7 @@
  $(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 @@
+@@ -760,13 +818,15 @@
  	$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
  else
  	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
@@ -535,7 +544,7 @@
  ${ALL_OBJECTS_DIR}/FileUtility.o:
  ifeq ($(PLATFORM), OS390)
  ${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
-@@ -751,6 +810,8 @@
+@@ -788,6 +848,8 @@
  
  Conf: Harness $(BINTARGETDIR)/Conf
  
@@ -544,7 +553,7 @@
  $(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 @@
+@@ -796,15 +858,18 @@
  	$(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} \
@@ -562,28 +571,29 @@
 -$(THISLIB)$(VER)$(SHLIBSUFFIX): $(ALL_OBJECTS)
 -	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS) $^ -o $@ 
 +$(THISLIB)$(LIBSUFFIX): $(ALL_OBJECTS)
-+	@l_ar@ $@ $^
++	$(AR) $@ $^
++	$(RANLIB) $@ 2>/dev/null || true
  ifeq ($(PLATFORM), OS390)
  	cp -p *.x  ${LIB_DIR}        
  endif                                
-@@ -779,6 +842,7 @@
- 	rm -rf $(XALANCROOT)/src/so_locations
+@@ -817,6 +882,7 @@
+ 	rm -rf $(OUTDIR)/so_locations
  endif
  	rm -f $(THISLIB)$(VER)$(SHLIBSUFFIX)
 +	rm -f $(THISLIB)$(LIBSUFFIX)
  	rm -f $(THISLIB)$(VER).map1
  	rm -f $(BINTARGETDIR)/testXSLT
  	rm -f $(BINTARGETDIR)/testXPath
-@@ -798,3 +862,6 @@
+@@ -838,3 +904,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 @@
+--- c/src/XPath/XPathExpression.hpp.dist	2003-03-05 05:41:11.000000000 +0100
++++ c/src/XPath/XPathExpression.hpp	2003-06-02 17:45:50.000000000 +0200
+@@ -834,7 +834,7 @@
  		}
  		else
  		{
@@ -592,7 +602,7 @@
  
  			return OpCodeMapValueType(theSize);
  		}
-@@ -863,7 +863,7 @@
+@@ -903,7 +903,7 @@
  	{
  		assert(opPos < opCodeMapSize());
  
@@ -601,9 +611,9 @@
  
  		return OpCodeMapValueType(opPos + m_opMap[opPos + s_opCodeMapLengthIndex]);
  	}
---- c/src/Include/GCCDefinitions.hpp.dist	Tue Jan  7 11:59:57 2003
-+++ c/src/Include/GCCDefinitions.hpp	Tue Jan  7 12:00:16 2003
-@@ -89,4 +89,6 @@
+--- c/src/Include/GCCDefinitions.hpp.dist	2003-02-19 10:21:29.000000000 +0100
++++ c/src/Include/GCCDefinitions.hpp	2003-06-02 17:45:50.000000000 +0200
+@@ -90,4 +90,6 @@
  
  #define XALAN_UNALIGNED
  

xalan-c/xalan-c.spec

@@ -23,9 +23,11 @@
 ##  SUCH DAMAGE.
 ##
 
+#   FIXME mlelstv - does not build with newer xerces-c
+
 #   package version
-%define       V_opkg    1.4
-%define       V_dist    1_4
+%define       V_opkg    1.5
+%define       V_dist    1_5
 
 #   package information
 Name:         xalan-c
@@ -33,11 +35,11 @@ Summary:      XSLT processor
 URL:          http://xml.apache.org/xalan-c/
 Vendor:       Apache Software Foundation
 Packager:     The OpenPKG Project
-Distribution: OpenPKG [EVAL]
+Distribution: OpenPKG [JUNK]
 Group:        Web
 License:      Apache Software License 1.1
 Version:      %{V_opkg}
-Release:      20030408
+Release:      20030602
 
 #   package options
 %option       with_threads  no
@@ -49,8 +51,10 @@ Patch0:       xalan-c.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 1.2.0, autoconf, libtool, gcc >= 3.2.2, make, xerces-c >= 2.1.0
+BuildPreReq:  OpenPKG, openpkg >= 1.2.0, autoconf, gcc >= 3.2.2, make
+BuildPreReq:  xerces-c >= 2.1.0, xerces-c::with_cpp_namespace = no
 PreReq:       OpenPKG, openpkg >= 1.2.0, xerces-c >= 2.1.0
+PreReq:       xerces-c::with_cpp_namespace = no
 %if "%{with_threads}" == "yes"
 BuildPreReq:  xerces-c::with_threads = yes
 PreReq:       xerces-c::with_threads = yes
@@ -71,12 +75,13 @@ AutoReqProv:  no
 
 %build
     rm -rf $RPM_BUILD_ROOT
-    ( XALANCROOT=`pwd` ;
+    ( XALANCROOT=`pwd`/c ;
       XERCESCROOT=%{l_prefix} ;
       export XALANCROOT XERCESCROOT ;
       cd c/src ;
       %{l_shtool} subst \
-          -e 's;@l_ar@;%{l_libtool} --mode=link c++ -static -o;' \
+          -e 's;@l_ar@;ar cru;' \
+          -e 's;@l_ranlib@;ranlib;' \
           Makefile.in ;
       pf=LINUX;
       cf="";