[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1421489 - in /subversion/trunk: configure.ac get-deps.sh

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 17 Dec 2012 18:38:11 +0200

Arfrever Frehtes Taifersar Arahesis wrote on Mon, Dec 17, 2012 at 11:35:10 +0100:
> 2012-12-14 22:36:27 Daniel Shahaf napisaƂ(a):
> > arfrever_at_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.
>
> POSIX [1] says that it should work:
>
> "Any extra c or s conversion specifiers shall be evaluated as if a null string argument were supplied;
> other extra conversion specifications shall be evaluated as if a zero argument were supplied."
>

I get:

$ SQLITE_VERSION=3.7.15; printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e 's/\./ /g')
3071515
$

I've raised a bug report with FreeBSD (don't have the bug number yet).

> Which one of the following do you prefer?:
> 1. SQLITE=sqlite-amalgamation-$(python -c "print('%u%02u%02u%02u' % tuple(int(x) for x in '${SQLITE_VERSION}.0.0.0.0'.split('.')[:4]))")
> 2. SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo ${SQLITE_VERSION}.0.0.0 | sed -e 's/\([[:digit:]]\+\)\.\([[:digit:]]\+\)\.\([[:digit:]]\+\)\.\([[:digit:]]\+\).*/\1 \2 \3 \4/g'))
>

SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION.0.0.0 | cut -d. -f1,2,3,4 | sed -e 's/\./ /g'))

> [1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/printf.html
>
> --
> Arfrever Frehtes Taifersar Arahesis

Cheers

Daniel
Received on 2012-12-17 17:38:49 CET

This is an archived mail posted to the Subversion Dev mailing list.