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 Date: 06-Dec-2002 15:56:00 Branch: HEAD Handle: 2002120614560000 Added files: openpkg-src/xerces-c xerces-c.patch Modified files: openpkg-src/xerces-c xerces-c.spec Log: building static library now Summary: Revision Changes Path 1.1 +41 -0 openpkg-src/xerces-c/xerces-c.patch 1.2 +31 -27 openpkg-src/xerces-c/xerces-c.spec ____________________________________________________________________________ Index: openpkg-src/xerces-c/xerces-c.patch ============================================================ $ cvs update -p -r1.1 xerces-c.patch --- 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 @@ ################################################################### PLATFORM = @platform@ +AR = @l_ar@ CC = @cc@ CXX = @cxx@ GCC = @GCC@ @@ -117,7 +118,7 @@ \rm -f $(DUMMYEXE) $(DUMMYEXE): $(ALL_OBJECTS) - ${MAKE_SHARED} -o ${@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS) + $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS) ###### End HP-UX CC compiler specific stuff ####### else @@ -147,11 +148,7 @@ ${FQ_REAL_NAME}: $(ALL_OBJECTS) @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) ## Start OS390 ## ifeq (${PLATFORM},OS390) @@ -200,7 +197,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 - $(CP) ${FQ_REAL_NAME} $(PREFIX)/lib + $(CP) ${FQ_LINK_NAME:.so=.a} $(PREFIX)/lib endif ifeq (${PLATFORM},OS390) $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} $(PREFIX)/lib Index: openpkg-src/xerces-c/xerces-c.spec ============================================================ $ cvs diff -u -r1.1 -r1.2 xerces-c.spec --- openpkg-src/xerces-c/xerces-c.spec 6 Dec 2002 10:50:30 -0000 1.1 +++ openpkg-src/xerces-c/xerces-c.spec 6 Dec 2002 14:56:00 -0000 1.2 @@ -44,12 +44,13 @@ # list of sources Source0: http://xml.apache.org/dist/xerces-c/stable/xerces-c-src%{Vs_xerces}.tar.gz +Patch0: xerces-c.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20021120, autoconf, gcc, make -PreReq: OpenPKG, openpkg >= 20021120 +BuildPreReq: OpenPKG, gcc, make +PreReq: OpenPKG %if "%{with_pth}" == "yes" BuildPreReq: pth PreReq: pth @@ -65,43 +66,46 @@ %prep %setup -q -n xerces-c-src%{Vs_xerces} + %patch0 -p0 %build + rm -rf $RPM_BUILD_ROOT ( XERCESCROOT=`pwd` ; \ export XERCESCROOT ; \ cd $XERCESCROOT/src/xercesc ; \ - autoconf ; \ - os="freebsd" ; \ - pt="pthread" ; \ - case "%{l_target}" in \ - *-freebsd*) os=freebsd ; pt=pthread ;; \ - *-linux*) os=linux ; pt=pthread ;; \ - *-solaris*) os=solaris ; pt=pthread ;; \ - *-irix*) os=irix ; pt=sproc ;; \ - *-hpux-10.*) os=hp-10 ; pt=none ;; \ - *-hpux-11.*) os=hp-11 ; pt=none ;; \ - *-aix*) os=aix ; pt=pthread ;; \ - esac ; \ - ./runConfigure \ - -P%{l_prefix} \ - -p$os \ - -cgcc \ - -xg++ \ - -minmem \ - -nsocket \ - -tnative \ - -r$pt ; \ - %{l_make} %{l_mflags -O} \ + %{l_shtool} subst \ + -e 's;@l_ar@;%{l_ar};' \ + obj/Makefile.in + autoconf ; \ + os="freebsd" ; \ + pt="pthread" ; \ + case "%{l_target}" in \ + *-freebsd*) os=freebsd ; pt=pthread ;; \ + *-linux*) os=linux ; pt=pthread ;; \ + *-solaris*) os=solaris ; pt=pthread ;; \ + *-irix*) os=irix ; pt=sproc ;; \ + *-hpux-10.*) os=hp-10 ; pt=none ;; \ + *-hpux-11.*) os=hp-11 ; pt=none ;; \ + *-aix*) os=aix ; pt=pthread ;; \ + esac ; \ + ./runConfigure \ + -P%{l_prefix} \ + -p$os \ + -cgcc \ + -xg++ \ + -minmem \ + -nsocket \ + -tnative \ + -r$pt ; \ + %{l_make} %{l_mflags -O} \ ) %install ( XERCESCROOT=`pwd` ; \ export XERCESCROOT ; \ cd $XERCESCROOT/src/xercesc ; \ - rm -rf $RPM_BUILD_ROOT ; \ - %{l_make} %{l_mflags} install "PREFIX=$RPM_BUILD_ROOT%{l_prefix}" ; \ + %{l_make} %{l_mflags} install "PREFIX=$RPM_BUILD_ROOT%{l_prefix}" ; \ ) - strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]