OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 24-Jan-2009 22:52:18 Branch: HEAD Handle: 2009012421521800 Modified files: openpkg-src/apr apr.spec Log: fix building of DBD DSOs and add ODBC support, too Summary: Revision Changes Path 1.59 +23 -2 openpkg-src/apr/apr.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/apr/apr.spec ============================================================================ $ cvs diff -u -r1.58 -r1.59 apr.spec --- openpkg-src/apr/apr.spec 24 Jan 2009 21:32:38 -0000 1.58 +++ openpkg-src/apr/apr.spec 24 Jan 2009 21:52:18 -0000 1.59 @@ -44,6 +44,7 @@ %option with_gdbm no %option with_iconv no %option with_ldap no +%option with_odbc no %option with_pgsql no %option with_mysql no %option with_sqlite no @@ -76,6 +77,10 @@ BuildPreReq: openldap, openssl >= 0.9.8 PreReq: openldap, openssl >= 0.9.8 %endif +%if "%{with_odbc}" == "yes" +BuildPreReq: ODBC +PreReq: ODBC +%endif %if "%{with_pgsql}" == "yes" BuildPreReq: postgresql PreReq: postgresql @@ -129,7 +134,8 @@ %else --disable-threads \ %endif - --disable-shared + --enable-shared \ + --enable-static %{l_make} %{l_mflags -O} ) || exit $? ( cd apr-util-%{V_apr_util} @@ -174,16 +180,29 @@ --with-ldap-include=%{l_prefix}/include/ \ --with-ldap-lib=%{l_prefix}/lib \ %endif +%if "%{with_odbc}" == "yes" + --with-odbc=%{l_prefix} \ +%else + --without-odbc \ +%endif %if "%{with_pgsql}" == "yes" --with-pgsql=%{l_prefix} \ +%else + --without-pgsql \ %endif %if "%{with_mysql}" == "yes" --with-mysql=%{l_prefix} \ +%else + --without-mysql \ %endif %if "%{with_sqlite}" == "yes" --with-sqlite3=%{l_prefix} \ +%else + --without-sqlite3 \ %endif - --disable-shared + --enable-util-dso \ + --enable-shared \ + --enable-static %{l_make} %{l_mflags -O} ) || exit $? @@ -197,7 +216,9 @@ ) || exit $? rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/aprutil.exp + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr-util-1/*.a rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so* %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
