Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert r1566960, r1566977, r1566978, and r1567034.

We have a way to disable the problematic features at runtime. So we'll do

that instead.

  1. … 2 more files in changeset.
[Reverted in r1567282]

Add tests for the broken SQLite STAT3 and STAT4 options and disallow their

use with SQLite 3.8.1 through 3.8.3 (inclusive).

* build/ac-macros/sqlite.m4

(SVN_SQLITE_BROKEN_OPTIONS): New macro.

(SVN_LIB_SQLITE): Use our new macro.

Followup to r1499034:

* build/ac-macros/sqlite.m4

(SVN_DOWNLOAD_SQLITE): Don't print the same path twice.

* build/ac-macros/sqlite.m4

(SVN_LIB_SQLITE.--with-sqlite): Look for sqlite-amalgamation in the build

dir, too.

(SVN_DOWNLOAD_SQLITE): Adjust error message accordingly.

configure.ac: don't recommend using tar/gunzip to unpack a zip.

* configure.ac:

Add note to update build/ac-macros/sqlite.m4 if changing

SQLITE_URL's file extension.

* build/ac-macros/sqlite.m4:

Recommend using unzip since SQLITE_URL ends in .zip.

  1. … 1 more file in changeset.
Temporarily revert part of the change from the tweak-build-take-two branch that

moved the expected location of the SQLite amalgamation directory and used

relative paths to include those files, because it conflicts with the use of

--with-sqlite to locate an amalgamation directory outside the build tree.

Note that this can cause builds to fail if non-amalgamated SQLite is found

elsewhere on the include path before the amalagamated files.

* INSTALL, get-deps.sh:

- Change expected location of the amalgamation package.

* build/ac-macros/sqlite.m4:

- Look for $abs_srcdir/sqlite-amalgamation.

- Do add include paths to wherever the amalgamation was found.

* subversion/libsvn_subr/sqlite.c, subversion/libsvn_subr/sqlite3wrapper.c,

subversion/tests/libsvn_wc/wc-queries-test.c: Do not use relative paths

to include amalgamation sources.

  1. … 7 more files in changeset.
Reintegrate tweak-build-take-two branch to trunk.

Summary of changes:

** Split standards-compliance mode and maintainer mode compiler flags

out of CFLAGS, so that compilation command lines that do not

generate (too many) warnings or are not forced to comply with ISO

C '90 can be constructed without having to resort to stripping

individual flags out of CFLAGS.

$ svn diff -r1424288:1424822 \

^/subversion/branches/tweak-build-take-two/configure.ac \

^/subversion/branches/tweak-build-take-two/aclocal.m4 \

^/subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4 \

^/subversion/branches/tweak-build-take-two/Makefile.in

** Now that warning and standards-compliance mode macros are no

longer part of CFLAGS, stop stripping them in the Swig wrapper

configury, except for Ruby, which is more delicate.

$ svn diff -r1424329:1425040 \

^/subversion/branches/tweak-build-take-two/build/ac-macros/swig.m4

** Allow optimization and debugging to coexist, including in

maintainer mode, adding a new configure option

--enable-optimize. Neither --enable-optimize nor --enable-debug

will override any optimization or debugging flags set by the user

in C(XX)FLAGS at configure time. If debugging and optimization are

enabled at the same time, we will try to use -O1, then -O; if

debuggin is not enabled, we will try -O2 first.

$ svn diff -c1424860 \

^/subversion/branches/tweak-build-take-two/configure.ac

** Remove an obsolete autoconf macro that was not used anywhere and

is superceded with SVN_CFLAGS_ADD_IFELSE.

$ svn diff -c1424297 \

^/subversion/branches/tweak-build-take-two/build/ac-macros/svn-macros.m4

** Move the sqlite-amalgamation directory from the root of the source tree

under subversion/include/private to make include paths safer from

possible collision with sqlite include files from other install locations.

$ svn diff -c1425050 \

^/subversion/branches/tweak-build-take-two

** Allow a user to set a custom set of compiler flags at configure time that

are used for Subversion sources, but not, e.g., Swig-generated sources,

like this:

$ ./configure CUSERFLAGS=--flags-for-C CXXUSERFLAGS=--flags-for-C++

$ svn diff -c1425086 \

^/subversion/branches/tweak-build-take-two

  1. … 14 more files in changeset.
* build/ac-macros/sqlite.m4

(SVN_DOWNLOAD_SQLITE): Minor correction to build directions.

Be a bit more careful about which additional libraries we link with when

building with amalgamated SQLite.

* build/ac-macros/sqlite.m4 (_SVN_SQLITE_DSO_LIBS): New. Check which additionsl

libraries we have to link in order to support DSO loading.

(SVN_SQLITE_FILE_CONFIG): Use the result of _SVN_SQLITE_DSO_LIBS instead

of always linking with -ldl, which fails (at least) on FreeBSD.

Make a configure macro reuseable.

Patch by: Jonathan Nieder <jrnieder@gmail.com>

(portion of a patch that also touched other files)

* build/ac-macros/sqlite.m4

(SVN_SQLITE_VERNUM_PARSE): Make it reusable (in particular for

configure.ac), by taking a version string and a variable to store the

corresponding version number as arguments.

(SVN_SQLITE_PKG_CONFIG): Adapt SVN_SQLITE_VERNUM_PARSE call to the new

calling convention.

(SVN_SQLITE_MIN_VERNUM_PARSE): Simplify by calling

SVN_SQLITE_VERNUM_PARSE.

Remove mention of now-defunct deps tarball from configure output and INSTALL.

Found by: Barry Scott <barry@barrys-emacs.org>

* build/ac-macros/sqlite.m4:

Don't mention the deps tarball.

* INSTALL:

Remove text noting the deps tarball.

  1. … 1 more file in changeset.
Silence './configure -q'.

* build/ac-macros/sqlite.m4

(SVN_SQLITE_FILE_CONFIG): Use autoconf macros that may suppress the output.

Follow-up to r958267:

* build/ac-macros/sqlite.m4

(SVN_SQLITE_FILE_CONFIG): Also include -ldl in SVN_SQLITE_LIBS.

Follow-up to r958263:

* build/ac-macros/sqlite.m4

(SVN_SQLITE_FILE_CONFIG): Set SVN_SQLITE_LIBS.

Apply ASF license headers to a number of files included under that license

but lacking said header.

Patch by: Niall Pemberton <niallp{_AT_}apache.org>

  1. … 175 more files in changeset.
Follow-up to r38377:

Rename SVN_REMOVE_REDUNDANT_LIB_DIRS to SVN_REMOVE_STANDARD_LIB_DIRS.

* build/ac-macros/svn-macros.m4

(SVN_REMOVE_REDUNDANT_LIB_DIRS): Rename to ...

(SVN_REMOVE_STANDARD_LIB_DIRS): ... this. Improve doc string. Filter -L

options with standard library search directories followed by '/'.

* build/ac-macros/apr.m4

(SVN_LIB_APR):

* build/ac-macros/aprutil.m4

(SVN_LIB_APRUTIL):

* build/ac-macros/gssapi.m4

(SVN_LIB_RA_SERF_GSSAPI):

* build/ac-macros/kwallet.m4

(SVN_LIB_KWALLET):

* build/ac-macros/sasl.m4

(SVN_LIB_SASL):

* build/ac-macros/sqlite.m4

(SVN_SQLITE_DIR_CONFIG):

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Update.

Suggested by: julianfoad

stsp

  1. … 7 more files in changeset.
Filter out redundant library directories (e.g. /usr/lib) to avoid linking

against Subversion libraries potentially placed in these directories.

* build/ac-macros/svn-macros.m4

(SVN_REMOVE_REDUNDANT_LIB_DIRS): New.

* build/ac-macros/apr.m4

(SVN_LIB_APR):

* build/ac-macros/aprutil.m4

(SVN_LIB_APRUTIL):

* build/ac-macros/gssapi.m4

(SVN_LIB_RA_SERF_GSSAPI):

* build/ac-macros/kwallet.m4

(SVN_LIB_KWALLET):

* build/ac-macros/sasl.m4

(SVN_LIB_SASL):

* build/ac-macros/sqlite.m4

(SVN_SQLITE_DIR_CONFIG):

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Use SVN_REMOVE_REDUNDANT_LIB_DIRS.

  1. … 7 more files in changeset.
Revert r38218. Buildbots now provide 'config.log' when an error occurs.

  1. … 16 more files in changeset.
Make `configure` sometimes print the content of 'config.log' when an error occurs.

* build/ac-macros/svn-macros.m4

(SVN_MSG_ERROR): New.

* build/ac-macros/apache.m4:

* build/ac-macros/apr.m4:

* build/ac-macros/apr_memcache.m4:

* build/ac-macros/aprutil.m4:

* build/ac-macros/berkeley-db.m4:

* build/ac-macros/ctypesgen.m4:

* build/ac-macros/gssapi.m4:

* build/ac-macros/java.m4:

* build/ac-macros/kwallet.m4:

* build/ac-macros/neon.m4:

* build/ac-macros/sasl.m4:

* build/ac-macros/serf.m4:

* build/ac-macros/sqlite.m4:

* build/ac-macros/swig.m4:

* build/ac-macros/zlib.m4:

* configure.ac: Use SVN_MSG_ERROR() instead of AC_MSG_ERROR().

[Reverted in r38285.]

  1. … 16 more files in changeset.
Set svn:eol-style property on some files.

* build/ac-macros/apr_memcache.m4:

* build/ac-macros/ctypesgen.m4:

* build/ac-macros/gssapi.m4:

* build/ac-macros/sasl.m4:

* build/ac-macros/serf.m4:

* build/ac-macros/sqlite.m4:

* build/ac-macros/zlib.m4: Set svn:eol-style property to 'native'.

  1. … 6 more files in changeset.
Search for pkg-config only once and use pkg-config found by AC_PATH_PROG.

* configure.ac

(pkg-config): Use AC_PATH_PROG to find pkg-config and store the path to

pkg-config in PKG_CONFIG variable.

(D-Bus, GNOME Keyring): Use PKG_CONFIG variable.

* build/ac-macros/kwallet.m4

(SVN_LIB_KWALLET):

* build/ac-macros/neon.m4

(SVN_LIB_NEON, SVN_NEON_CONFIG):

* build/ac-macros/sqlite.m4

(SVN_SQLITE_PKG_CONFIG): Use PKG_CONFIG variable.

  1. … 3 more files in changeset.
Build the local SQLite amalgamation source file, if present, in preference

to linking to an installed SQLite on the system, if no location for it is

specified. This makes for consistency with the way we find other libraries

that can be built locally.

* build/ac-macros/sqlite.m4

(SVN_LIB_SQLITE): Look for a local version before an installed version.

* build/ac-macros/sqlite.m4

(SVN_SQLITE_DIR_CONFIG): When checking for an sqlite installation directory,

set the hoped-for compiler flags before running the test compilation.

Tweak some doc strings and code trivia related to the detection of SQLite.

* build/ac-macros/sqlite.m4

(SVN_LIB_SQLITE): Correct the doc string. Stop passing an (unused)

argument to SVN_SQLITE_VERNUM_PARSE.

(SVN_SQLITE_VERNUM_PARSE): Remove an unused argument assignment. Expand

the doc string.

(SVN_SQLITE_MIN_VERNUM_PARSE): Add a doc string.

* build/ac-macros/sqlite.m4: Delete svn:mergeinfo.

* build/ac-macros/sqlite.m4

(SVN_DOWNLOAD_SQLITE): Make doc consistent with code.

Improve SQLite auto-fu so that you don't require 'python' at build-time by

using more traditional auto-fu. Also permit pre-configured sqlite to just

'work' (and not require it to be in /usr).

* build/ac-macros/sqlite.m4

(SVN_LIB_SQLITE): Always parse minimum version; don't pass /usr rather let

the compiler do its magic (via CPPFLAGS/LDFLAGS already set);

(SVN_SQLITE_DIR_CONFIG, SVN_SQLITE_FILE_CONFIG): Rewrite to use AC_EGREP_CPP

rather than call into 'python'.

(SVN_SQLITE_VERNUM_PARSE): Split out into... (N.B. could still be improved)

(SVN_SQLITE_MIN_VERNUM_PARSE): this.

* build/ac-macros/sqlite.m4

(SVN_LIB_SQLITE): Use $abs_srclib not `pwd` to check for an included

sqlite amalgamation, to support out-of-tree builds.

* build/ac-macros/sqlite.m4

(SVN_SQLITE_PKG_CONFIG): Remove unnecessary output when pkg-config

finds sqlite3.

* build/ac-macros/sqlite.m4 (SVN_SQLITE_PKG_CONFIG): Removed false statement

in function comment.