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: 11-Jan-2003 18:25:08
Branch: HEAD Handle: 2003011117250601
Modified files:
openpkg-src/xalan-c xalan-c.patch xalan-c.spec
openpkg-web news.txt
Log:
requires libtool for building
Summary:
Revision Changes Path
1.3 +35 -16 openpkg-src/xalan-c/xalan-c.patch
1.8 +13 -5 openpkg-src/xalan-c/xalan-c.spec
1.2659 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xalan-c/xalan-c.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xalan-c.patch
--- openpkg-src/xalan-c/xalan-c.patch 2 Jan 2003 16:15:17 -0000 1.2
+++ openpkg-src/xalan-c/xalan-c.patch 11 Jan 2003 17:25:07 -0000 1.3
@@ -1,5 +1,5 @@
--- c/src/Makefile.in.dist Thu Dec 12 13:14:03 2002
-+++ c/src/Makefile.in Wed Dec 18 09:26:01 2002
++++ c/src/Makefile.in Tue Jan 7 14:17:08 2003
@@ -143,8 +143,9 @@
ifeq ($(PLATFORM), LINUX)
@@ -178,51 +178,61 @@
XalanExe: lib $(BINTARGETDIR)/Xalan
ifeq ($(PLATFORM), OS390)
- $(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
+-$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
++$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o lib
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) $^ -o
$@
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x
$(ALLLIBS)
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/XalanExe.o -o $@
$(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
- $(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
+-$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
++$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o lib
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $^ -o $@
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/XalanExe.o -o $@ -L$(LIB_DIR)
-l$(PROJECT_NAME) $(ALLLIBS)
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -451,13 +468,13 @@
+@@ -449,15 +466,15 @@
+ testXSLT: lib $(BINTARGETDIR)/testXSLT
+
ifeq ($(PLATFORM), OS390)
- $(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
+-$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
++$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o lib
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) $^ -o
$@
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x
$(ALLLIBS)
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/process.o -o $@
$(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
- $(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
+-$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
++$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o lib
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $^ -o $@
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/process.o -o $@ -L$(LIB_DIR)
-l$(PROJECT_NAME) $(ALLLIBS)
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-@@ -467,7 +484,7 @@
+@@ -465,44 +482,54 @@
+ testXPath: lib $(BINTARGETDIR)/testXPath
+
ifeq ($(PLATFORM), OS390)
- $(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
+-$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
++$(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) $^ -o $@
$(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
++ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x
$(ALLLIBS)
${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,34 +492,44 @@
+ $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
- $(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
+-$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
++$(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) $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME)
$(ALLLIBS)
++ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME)
$(ALLLIBS)
${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -591,3 +601,12 @@
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 @@
+
+ #define XALAN_UNALIGNED
+
++#define XALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
++
+ #endif // GCCDEFINITIONS_HEADER_GUARD_1357924680
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xalan-c/xalan-c.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 xalan-c.spec
--- openpkg-src/xalan-c/xalan-c.spec 3 Jan 2003 11:47:31 -0000 1.7
+++ openpkg-src/xalan-c/xalan-c.spec 11 Jan 2003 17:25:07 -0000 1.8
@@ -37,7 +37,7 @@
Group: Web
License: Apache Software License 1.1
Version: %{V_opkg}
-Release: 20030103
+Release: 20030111
# package options
%option with_threads no
@@ -49,8 +49,15 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, autoconf, gcc, make, xerces-c >= 2.1.0
+BuildPreReq: OpenPKG, openpkg >= 20030103, autoconf, libtool, gcc, make, xerces-c
>= 2.1.0
PreReq: OpenPKG, openpkg >= 20030103, xerces-c >= 2.1.0
+%if "%{with_threads}" == "yes"
+BuildPreReq: xerces-c::with_threads = yes
+PreReq: xerces-c::with_threads = yes
+%else
+BuildPreReq: xerces-c::with_threads = no
+PreReq: xerces-c::with_threads = no
+%endif
AutoReq: no
AutoReqProv: no
@@ -123,11 +130,12 @@
%endif
CC="%{l_cc} $cf" \
CXX="%{l_cxx} $cf" \
- CFLAGS="%{l_cflags -O}" \
+ CFLAGS="-O0 -g" \
+ CXXFLAGS="-O0 -g" \
LDFLAGS="%{l_ldflags} $lf" \
./configure \
- --prefix=%{l_prefix} ; \
- %{l_make} %{l_mflags} PLATFORM="$pf"
+ --prefix=%{l_prefix}
+ %{l_make} %{l_mflags -O} PLATFORM="$pf"
)
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2658 -r1.2659 news.txt
--- openpkg-web/news.txt 11 Jan 2003 16:04:31 -0000 1.2658
+++ openpkg-web/news.txt 11 Jan 2003 17:25:06 -0000 1.2659
@@ -1,3 +1,4 @@
+11-Jan-2003: Upgraded package: P<xalan-c-1.4-20030111>
11-Jan-2003: Upgraded package: P<xv-3.10a-20030111>
11-Jan-2003: Upgraded package: P<ocaml-3.06-20030111>
11-Jan-2003: Upgraded package: P<tftp-0.32-20030111>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
