SPECS: apr-util.spec - fixed libaprutil build (in case buildconf p...

[qboosh]

Author: qboosh                       Date: Fri Jan 13 18:06:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed libaprutil build (in case buildconf puts apr_dbd.lo after apr_dbd_*)
- link libaprutil-1.la just once

---- Files affected:
SPECS:
   apr-util.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/apr-util.spec
diff -u SPECS/apr-util.spec:1.43 SPECS/apr-util.spec:1.44
--- SPECS/apr-util.spec:1.43	Thu Jan  5 09:34:09 2006
+++ SPECS/apr-util.spec	Fri Jan 13 19:05:54 2006
@@ -151,6 +151,9 @@
 %build
 ./buildconf \
 	--with-apr=%{_datadir}/apr
+%if %{with dso}
+%{__sed} -i -e '/OBJECTS_all/s, dbd/apr_dbd_[^ ]*\.lo,,g' build-outputs.mk
+%endif
 
 %configure \
 	--with-apr=%{_bindir}/apr-1-config \
@@ -169,20 +172,20 @@
 	CC="%{__cc}"
 
 %if %{with dso}
-%{__sed} -i -e '/OBJECTS_all/s, dbd/apr_dbd_.*\.lo,,g' build-outputs.mk
-rm -f libaprutil-1.la
-%{__make} libaprutil-1.la
-
 %if %{with mysql}
+%{__make} dbd/apr_dbd_mysql.lo
 libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_mysql.lo -lmysqlclient_r -o dbd/libapr_dbd_mysql.la
 %endif
 %if %{with pgsql}
+%{__make} dbd/apr_dbd_pgsql.lo
 libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_pgsql.lo -lpq  -o dbd/libapr_dbd_pgsql.la
 %endif
 %if %{with sqlite2}
+%{__make} dbd/apr_dbd_sqlite2.lo
 libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_sqlite2.lo -o dbd/libapr_dbd_sqlite2.la
 %endif
 %if %{with sqlite3}
+%{__make} dbd/apr_dbd_sqlite3.lo
 libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_sqlite3.lo -lsqlite3 -o dbd/libapr_dbd_sqlite3.la
 %endif
 %endif
@@ -270,6 +273,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2006/01/13 18:05:54  qboosh
+- fixed libaprutil build (in case buildconf puts apr_dbd.lo after apr_dbd_*)
+- link libaprutil-1.la just once
+
 Revision 1.43  2006/01/05 08:34:09  qboosh
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apr-util.spec?r1=1.43&r2=1.44&f=u