OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 07-Dec-2002 11:35:56
Branch: HEAD Handle: 2002120710355501
Modified files:
openpkg-src/xerces-c xerces-c.patch xerces-c.spec
openpkg-web news.txt
Log:
finally use libtool to build static library
Summary:
Revision Changes Path
1.2 +18 -14 openpkg-src/xerces-c/xerces-c.patch
1.3 +8 -4 openpkg-src/xerces-c/xerces-c.spec
1.2211 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/xerces-c/xerces-c.patch
============================================================
$ cvs diff -u -r1.1 -r1.2 xerces-c.patch
--- openpkg-src/xerces-c/xerces-c.patch 6 Dec 2002 14:56:00 -0000 1.1
+++ openpkg-src/xerces-c/xerces-c.patch 7 Dec 2002 10:35:56 -0000 1.2
@@ -1,36 +1,40 @@
---- obj/Makefile.in.dist Fri Dec 6 15:39:08 2002
-+++ obj/Makefile.in Fri Dec 6 15:39:18 2002
-@@ -68,6 +68,7 @@
- ###################################################################
+--- obj/Makefile.in.dist Sat Dec 7 10:19:48 2002
++++ obj/Makefile.in Sat Dec 7 10:21:05 2002
+@@ -82,6 +82,9 @@
+ include ../version.incl
+ include ../src/xercesc/Makefile.incl
- PLATFORM = @platform@
++#override AR definition in Makefile.incl
+AR = @l_ar@
- CC = @cc@
- CXX = @cxx@
- GCC = @GCC@
-@@ -117,7 +118,7 @@
++
+ LIB=${XERCESCROOT}/lib
+ ## OS390BATCH
+ ifeq (${OS390BATCH},1)
+@@ -117,7 +120,7 @@
\rm -f $(DUMMYEXE)
$(DUMMYEXE): $(ALL_OBJECTS)
- ${MAKE_SHARED} -o ${@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS)
-+ $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
++ ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
###### End HP-UX CC compiler specific stuff #######
else
-@@ -147,11 +148,7 @@
+@@ -146,12 +149,8 @@
+ ########################################################
${FQ_REAL_NAME}: $(ALL_OBJECTS)
- @echo Building ${FQ_REAL_NAME}
+- @echo Building ${FQ_REAL_NAME}
- ${MAKE_SHARED} ${LD_SONAME} -o ${@} ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
- @echo symlink ${FQ_SO_NAME}
- rm -rf ${FQ_SO_NAME} && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
- @echo symlink ${FQ_LINK_NAME}
- rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
-+ $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
++ @echo Building ${FQ_LINK_NAME:.so=.a}
++ ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
## Start OS390 ##
ifeq (${PLATFORM},OS390)
-@@ -200,7 +197,7 @@
+@@ -200,7 +199,7 @@
ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/${LIBNAME}.dll.a
ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/libxerces.dll.a
else
Index: openpkg-src/xerces-c/xerces-c.spec
============================================================
$ cvs diff -u -r1.2 -r1.3 xerces-c.spec
--- openpkg-src/xerces-c/xerces-c.spec 6 Dec 2002 14:56:00 -0000 1.2
+++ openpkg-src/xerces-c/xerces-c.spec 7 Dec 2002 10:35:56 -0000 1.3
@@ -40,7 +40,7 @@
Group: Web
License: Apache Software License 1.1
Version: %{V_xerces}
-Release: 20021206
+Release: 20021207
# list of sources
Source0:
http://xml.apache.org/dist/xerces-c/stable/xerces-c-src%{Vs_xerces}.tar.gz
@@ -49,7 +49,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, gcc, make
+BuildPreReq: OpenPKG, gcc, make, libtool
PreReq: OpenPKG
%if "%{with_pth}" == "yes"
BuildPreReq: pth
@@ -72,10 +72,10 @@
rm -rf $RPM_BUILD_ROOT
( XERCESCROOT=`pwd` ; \
export XERCESCROOT ; \
- cd $XERCESCROOT/src/xercesc ; \
%{l_shtool} subst \
- -e 's;@l_ar@;%{l_ar};' \
+ -e 's;@l_ar@;%{l_libtool} --mode=link c++ -static -o;' \
obj/Makefile.in
+ cd $XERCESCROOT/src/xercesc ; \
autoconf ; \
os="freebsd" ; \
pt="pthread" ; \
@@ -88,6 +88,10 @@
*-hpux-11.*) os=hp-11 ; pt=none ;; \
*-aix*) os=aix ; pt=pthread ;; \
esac ; \
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
./runConfigure \
-P%{l_prefix} \
-p$os \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2210 -r1.2211 news.txt
--- openpkg-web/news.txt 6 Dec 2002 18:32:53 -0000 1.2210
+++ openpkg-web/news.txt 7 Dec 2002 10:35:55 -0000 1.2211
@@ -1,3 +1,4 @@
+07-Dec-2002: Upgraded package: P<xerces-c-2.1.0-20021207>
06-Dec-2002: Upgraded package: P<wget-1.8.2-20021206>
06-Dec-2002: Upgraded package: P<proftpd-1.2.7-20021206>
06-Dec-2002: Upgraded package: P<samhain-1.6.5-20021206>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
