Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xalan-c/patches/xalan-c-1.11.0_pre797991-parallel-build.patch

    Annotation of /trunk/xalan-c/patches/xalan-c-1.11.0_pre797991-parallel-build.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1376 - (hide annotations) (download)
    Wed Jun 29 13:06:56 2011 UTC (12 years, 10 months ago) by niro
    File size: 2714 byte(s) 
    serveral fixes
    1 niro 1376 diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
    2     --- xml-xalan.orig//c/src/xalanc/Makefile.in 2010-02-23 10:51:30.058353490 +0100
    3     +++ xml-xalan/c/src/xalanc/Makefile.in 2010-02-23 10:52:53.251679288 +0100
    4     @@ -84,6 +84,10 @@
    5     SAMPLES_DIR = ${XALANCROOT}/samples
    6     TESTS_DIR = ${XALANCROOT}/Tests
    7    
    8     +TESTXSLT_OBJS = ${XSL_OBJ_DIR}/process.o
    9     +XALANEXE_OBJS = ${XSL_OBJ_DIR}/XalanExe.o
    10     +TESTXPATH_OBJS = ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
    11     +
    12     ALL_VPATH_CPP = \
    13     $(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
    14     $(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
    15     @@ -169,6 +173,9 @@
    16    
    17     compile: $(ALL_OBJECTS)
    18    
    19     +$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale
    20     +locale: prepare
    21     +
    22     ifeq (${OS390BATCH},1)
    23     XalanExe: lib "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
    24    
    25     @@ -188,28 +195,28 @@
    26    
    27     else # Not OS390BATCH
    28    
    29     -XalanExe: lib $(XSL_BIN_DIR)/Xalan
    30     +XalanExe: $(XSL_BIN_DIR)/Xalan
    31    
    32     -$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
    33     +$(XSL_BIN_DIR)/Xalan: lib ${XALANEXE_OBJS}
    34     ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    35     - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    36     + ${EXTRA_LINK_OPTIONS} ${XALANEXE_OBJS} -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    37     ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
    38     $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    39     endif
    40    
    41     -testXSLT: lib $(XSL_BIN_DIR)/testXSLT
    42     +testXSLT: $(XSL_BIN_DIR)/testXSLT
    43    
    44     -$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
    45     +$(XSL_BIN_DIR)/testXSLT: lib ${TESTXSLT_OBJS}
    46     ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    47     - ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    48     + ${EXTRA_LINK_OPTIONS} ${TESTXSLT_OBJS} -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    49     ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
    50     $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    51    
    52     -testXPath: lib $(XSL_BIN_DIR)/testXPath
    53     +testXPath: $(XSL_BIN_DIR)/testXPath
    54    
    55     -$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
    56     +$(XSL_BIN_DIR)/testXPath: lib ${TESTXPATH_OBJS}
    57     ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    58     - ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    59     + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${TESTXPATH_OBJS} -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    60     ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
    61     $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    62