Magellan Linux

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

    Contents of /trunk/xalan-c/patches/xalan-c-1.11.0_pre797991-as-needed.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1376 - (show annotations) (download)
    Wed Jun 29 13:06:56 2011 UTC (12 years, 10 months ago) by niro
    File size: 5376 byte(s) 
    serveral fixes
    1 diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
    2 --- xml-xalan.orig/c/src/xalanc/Makefile.in 2009-07-27 00:23:08.411122528 +0200
    3 +++ xml-xalan/c/src/xalanc/Makefile.in 2009-07-27 00:45:09.514777553 +0200
    4 @@ -174,7 +174,7 @@
    5
    6 "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
    7 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    8 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@
    9 + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
    10 ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
    11 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    12
    13 @@ -182,7 +182,7 @@
    14
    15 "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
    16 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    17 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@
    18 + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
    19 ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
    20 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    21
    22 @@ -192,7 +192,7 @@
    23
    24 $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
    25 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    26 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
    27 + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    28 ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
    29 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    30 endif
    31 @@ -201,7 +201,7 @@
    32
    33 $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
    34 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    35 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
    36 + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    37 ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
    38 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    39
    40 @@ -209,7 +209,7 @@
    41
    42 $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
    43 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    44 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
    45 + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    46 ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
    47 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    48
    49 @@ -222,7 +222,7 @@
    50
    51 ${BATCH_TARGET}: $(ALL_OBJECTS)
    52 @echo Building ${BATCH_TARGET}
    53 - $(MAKE_SHARED) $(ALLLIBS) $^ -o $@
    54 + $(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
    55
    56 else
    57
    58 @@ -232,7 +232,7 @@
    59 $(MAKE) -C Utils $@
    60
    61 $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
    62 - $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS)
    63 + $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS) $(ALLLIBS)
    64 ifeq ($(PLATFORM), OS390)
    65 mv *.x ${XSL_LIB_DIR}
    66 else
    67 diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in
    68 --- xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in 2009-07-27 00:23:08.431122558 +0200
    69 +++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in 2009-07-27 00:43:47.674693543 +0200
    70 @@ -29,7 +29,7 @@
    71
    72 $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
    73 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
    74 - ${EXTRA_LINK_OPTIONS} $(LIBS) $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
    75 + ${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIBS) $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS)
    76
    77 $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp
    78 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    79 diff -Naur xml-xalan.orig/c/Tests/Makefile.in xml-xalan/c/Tests/Makefile.in
    80 --- xml-xalan.orig/c/Tests/Makefile.in 2009-07-27 00:23:08.514445103 +0200
    81 +++ xml-xalan/c/Tests/Makefile.in 2009-07-27 00:45:50.541094978 +0200
    82 @@ -62,7 +62,7 @@
    83
    84 $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o
    85 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    86 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
    87 + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    88 ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
    89 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    90
    91 @@ -70,7 +70,7 @@
    92
    93 $(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o
    94 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    95 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
    96 + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    97 ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
    98 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
    99
    100 @@ -92,7 +92,7 @@
    101
    102 $(XSL_BIN_DIR)/Perf: $(PERF_OBJECTS)
    103 ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
    104 - ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
    105 + ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
    106
    107 ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Performance/%.cpp
    108 $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<