Explorar o código

finally use libtool to build static library

Michael van Elst %!s(int64=23) %!d(string=hai) anos
pai
achega
2c72375b59
Modificáronse 2 ficheiros con 26 adicións e 18 borrados
  1. 18 14
      xerces-c/xerces-c.patch
  2. 8 4
      xerces-c/xerces-c.spec

+ 18 - 14
xerces-c/xerces-c.patch

@@ -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

+ 8 - 4
xerces-c/xerces-c.spec

@@ -40,7 +40,7 @@ Distribution: OpenPKG [EVAL]
 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 @@ Patch0:       xerces-c.patch
 #   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 @@ AutoReqProv:  no
     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 @@ AutoReqProv:  no
           *-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 \