subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <danie...@elego.de>
Subject Re: svn commit: r1421489 - in /subversion/trunk: configure.ac get-deps.sh
Date Fri, 14 Dec 2012 21:36:27 GMT
arfrever@apache.org wrote on Thu, Dec 13, 2012 at 20:21:13 -0000:
> Author: arfrever
> Date: Thu Dec 13 20:21:12 2012
> New Revision: 1421489
> 
> URL: http://svn.apache.org/viewvc?rev=1421489&view=rev
> Log:
> * configure.ac: Update recommended version of sqlite.
> * get-deps.sh: Update versions of apr-util, serf, sqlite and httpd.
> 
> Modified:
>     subversion/trunk/configure.ac
>     subversion/trunk/get-deps.sh
> 
> Modified: subversion/trunk/configure.ac
> URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1421489&r1=1421488&r2=1421489&view=diff
> ==============================================================================
> --- subversion/trunk/configure.ac (original)
> +++ subversion/trunk/configure.ac Thu Dec 13 20:21:12 2012
> @@ -148,9 +148,8 @@ SVN_FIND_APACHE(20020903)
>  
>  dnl Search for SQLite
>  SQLITE_MINIMUM_VER="3.7.12"
> -SQLITE_RECOMMENDED_VER="3.7.12"
> -SQLITE_RECOMMENDED_VER_URL="3071200"
> -SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER_URL}.zip"
> +SQLITE_RECOMMENDED_VER="3.7.15"
> +SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo
${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"
>  
>  SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
>                 ${SQLITE_URL})
> 
> Modified: subversion/trunk/get-deps.sh
> URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1421489&r1=1421488&r2=1421489&view=diff
> ==============================================================================
> --- subversion/trunk/get-deps.sh (original)
> +++ subversion/trunk/get-deps.sh Thu Dec 13 20:21:12 2012
> @@ -24,13 +24,13 @@
>  #
>  
>  APR=apr-1.4.6
> -APR_UTIL=apr-util-1.4.1
> -SERF=serf-1.0.1
> +APR_UTIL=apr-util-1.5.1
> +SERF=serf-1.1.1
>  ZLIB=zlib-1.2.7
> -SQLITE_VERSION=3.7.12.0
> +SQLITE_VERSION=3.7.15
>  SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e 's/\./
/g'))

Please restore the .0, or otherwise prevent printf from having
4 replaceables and 3 arguments --- otherwise it doesn't work on FreeBSD.

Both here and in configure.ac above.

>  
> -HTTPD=httpd-2.2.22
> +HTTPD=httpd-2.4.3
>  APR_ICONV=apr-iconv-1.2.1
>  
>  BASEDIR=`pwd`
> 
> 

Mime
View raw message