Checkout Tools
  • last updated 34 mins ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1677003 is being indexed.

Bump required JDK version for JavaHL to 1.6.


* build/ac-macros/java.m4 (SVN_FIND_JDK): Set Java source version to 1.6.

* subversion/bindings/javahl/README:

Update JDK and C++ version requirements. Update the rest of the

doc to match the current state of JavaHL.

  1. … 2 more files in changeset.
* Don't add -lstdc++ on FreeBSD 10 as it is not needed and

adding it causes linking to fail.


followup to r1506554.

* Followup to r1619075, we no longer need to disable the

string-plus-int compiler warning.


(CMAINTAINERFLAGS): Add -Wbad-function-cast, warnings show up in FSX.

Follow-up to r1572261:

* Actually accept APR/APR-Util 1.6.* - 1.9.*. Delete obsolete comment.

Move SVN_UNUSED into a private header.

* subversion/include/svn_types.h

(SVN_UNUSED): Remove and move to ...


(AH_BOTTOM): to here ...

* subversion/svn_private_config.hw

(SVN_UNUSED): and here.

  1. … 2 more files in changeset.
Fix GCC's "always_inline function might not be inlinable" warning.

As it turns out, these functions must also be marked as "inline"

if we want to enforce inlining.

Once at it, make the forced inline macro fall back to at least

APR-defined inlining (instead of no decoration at all) if there

is no way to enforce it.


(AH_BOTTOM): Make SVN__FORCE_INLINE imply APR_INLINE when not in


* subversion/svn_private_config.hw

(SVN__FORCE_INLINE): Fall back to APR_INLINE in non-SVN_DEBUG mode

when not using Visual C.

  1. … 1 more file in changeset.
Allow Swig to use Ruby 2.0 and 2.1.

Patch by: James McCoy <jamessan{_AT_}>

* build/ac-macros/swig.m4

(SVN_FIND_SWIG): Adjust include path for Ruby 2.

* Allow Ruby 2.0 and 2.1.

  1. … 1 more file in changeset.
Remove absurd warning message for ruby.


Ruby 1.9 support is hardly new now and only warning when using exactly 1.9.3

is silly.

Repeat the change made in r1577223, this time also tested on Linux.

Add libintl linker flags to SVN_INTL_LIBS on *nix builds.

Fixes linker flags recorded in libsvn_subr's pkg-config file

which never mentioned -lintl even if required.


* Set SVN_INTL_LIBS to the linker flags required

to link to libintl and export the value of SVN_INTL_LIBS

to the Makefile.

Revert part of r1577223 in an attempt to unbreak the Unix build.

* Don't set SVN_INTL_LIBS thus making it always empty.

Add libintl link flags to SVN_INTL_LIBS on *nix builds.

The SVN_INTL_LIBS variable was referred to but never defined.


* Set SVN_INTL_LIBS to the linker flags required

to link to libintl and export the value of SVN_INTL_LIBS

to the Makefile.

  1. … 1 more file in changeset.
* Don't ignore user-provided LDFLAGS while trying

to detect libmagic. Fixes libmagic detection where configure

relies on LDFLAGS to find libraries in non-standard locations.

* Add quotes around ${abs_srcdir}.

* Tweak .pc generation to handle builddir != srcdir.

Kick off work on pkg-config support (issue #738, and also #4435).

pkg-config support allows API consumers on UNIX-like systems to link

to Subversion libraries without having to manually specify the correct

set of linker flags, including the particular flags for dependencies

required by a particular build of Subversion (bdb, serf, etc.).

pkg-config uses libsvn_foo.pc files which describe the set of flags

required to link to libsvn_foo.

See for more information.

Make produce files for all Subversion libraries,

and make the configure script produce .pc files from these files.

Dependency declarations and linker flags are based on information

parsed from build.conf.

Dependencies of Subversion which support pkg-config can be marked

as such in build.conf, allowing pkg-config to resolve them. The

name of the dependency's pkg-config script has to be specified

without the .pc extension, e.g.:


type = lib

external-lib = $(SVN_GNOME_KEYRING_LIBS)

pkg-config = gnome-keyring-1

Dependencies not aware of pkg-config are added to linker flags directly.

To illustrate, the generated libsvn_client.pc file on my system contains:






Name: libsvn_client

Description: Subversion Client Library

Version: 1.9.0

Required: apr-1


Libs: -L${libdir} -lsvn_wc -lsvn_ra -lsvn_delta -lsvn_diff -lsvn_subr

Cflags: -I${includedir}


There is no support for optional dependencies between Subversion libraries

yet, however. For instance, libsvn_client might or might not be linked to

libsvn_ra_serf. Such dependencies are currently omitted. Also, I'm not

sure yet what to do in cases where a dependency might be statically or

dynamically linked, e.g. sqlite.

The .pc files are not being installed yet. I don't want to expose these

files to systems using pkg-config until all outstanding issues are resolved.

* build/generator/

(Generator.write): Generate files.

(Generator.write_pkg_config_dot_in_files): New helper function.

* build/generator/templates/ New file, the template.

* build.conf: apr, apr-util, serf, gnome-keyring, and sqlite support pkg-config.

There may be others (kwallet?) but I haven't investiged more yet.

I also haven't checked yet if all versions of these dependencies support

pkg-config. The most recent versions do support it.


(SVN_APR_MAJOR_VERSION): Declare. APR's major version number is needed

to select the correct pkg-config script name (e.g. apr-1 or apr-2).

Generate .pc files from files.

* subversion/libsvn_auth_gnome_keyring, subversion/libsvn_auth_kwallet,

subversion/libsvn_client, subversion/libsvn_delta, subversion/libsvn_diff,

subversion/libsvn_fs, subversion/libsvn_fs_base, subversion/libsvn_fs_fs,

subversion/libsvn_fs_util, subversion/libsvn_fs_x, subversion/libsvn_ra,

subversion/libsvn_ra_local, subversion/libsvn_ra_serf,

subversion/libsvn_ra_svn, subversion/libsvn_repos, subversion/libsvn_subr,

subversion/libsvn_wc: Ignore generated .pc and files.

  1. … 20 more files in changeset.
Quote the libtool path in case it contains spaces.

* Quote when definining since sometimes we specify the shell and

not just the path to libtool.

Don't rely on the presence of stdbool.h and inttypes.h headers for utf8proc.

* Check for stdbool.h and inttypes.h.

* subversion/libsvn_subr/utf8proc/utf8proc.h:

Include stdbool.h and inttypes.h only if we know they're available.

Otherwise, use typedefs based on APR's sized types.

* subversion/libsvn_subr/utf8proc.c:

Move the include of utf8proc.c after svn_private_config.h, so that the

presence symbols for stdbool.h and inttypes.h are available.

  1. … 2 more files in changeset.
Bump required version of Apache httpd to 2.2.x or newer.

* INSTALL: Change from 2.x to 2.2.x or newer.

* Require 2.2.x's module magic number.

  1. … 1 more file in changeset.
* Update require versions of APR/APR-Util to 1.3.x or newer.

* Raise required serf version to 1.3.4 (aka break the buildbots)

Fix accidentally-global variables.

[ Changes to libsvn_subr and named_atomic-test-common.h reverted in r1571500 ]


(CMAINTAINERFLAGS): Add -Wmissing-variable-declarations.

* subversion/libsvn_fs_fs/hotcopy.c


* subversion/libsvn_fs_x/hotcopy.c


* subversion/libsvn_repos/hooks.c

(parse_hooks_env_option_baton, parse_hooks_env_section_baton):

* subversion/libsvn_wc/wc_db.c

(struct op_delete_many_baton_t):

* subversion/svn/file-merge.c

(struct file_merge_baton):

Remove accidental declaration of global variables.

* subversion/libsvn_subr/ctype.c


* subversion/svndumpfilter/svndumpfilter.c


* subversion/svnserve/svnserve.c

(connection_pools, threads):

* subversion/tests/libsvn_fs_x/string-table-test.c


* subversion/tests/libsvn_subr/hashdump-test.c

(proplist, new_proplist, review):

* subversion/tests/libsvn_subr/io-test.c


* subversion/tests/libsvn_subr/named_atomic-test-common.h

(name_namespace, name_namespace1, name_namespace2):

* subversion/tests/libsvn_subr/packed-data-test.c

(sub_records, test_data_:

* subversion/tests/libsvn_subr/prefix-string-test.c


* subversion/tests/libsvn_subr/priority-queue-test.c

(numbers, expected_modified):

* subversion/tests/libsvn_subr/string-test.c

(phrase_1, phrase_2):

* subversion/tests/libsvn_subr/time-test.c

(test_timestamp, test_timestring, test_old_timestring):

* subversion/tests/libsvn_subr/translate-test.c


* subversion/tests/svn_test_main.c


Make these variables file-static.

* subversion/tests/svn_test_main.c

(test_argc, test_argv):

* tools/server-side/mod_dontdothat/mod_dontdothat.c


Make these variables truly global by also declaring them extern.

  1. … 21 more files in changeset.
Remove unused --with-openssl configure option, Issue #4456.

This hasn't had a use since 1.7.0 when we removed the ability to build

neon in-tree.


(): Remove definition of --with-openssl.

Fix building svn trunk on Mac OS X with the gnome keyring lib installed.

Don't check for gnome keyring and kwallet on Mac OS X. While these libraries are

available on the platform - you get libgnome-keyring when installing Gimp via

MacPorts - the auth providers' functions and symbols are currently not declared

on Mac OS X and Windows.


* build/ac-macros/kwallet.m4: Don't check for kwallet and gnome keyring on

darwin platforms.

  1. … 1 more file in changeset.
Filter out -no-cpp-precomp from flags passed to SWIG.

This is necessary since APR for whatever reason leaks the fact that it uses

-no-cpp-precomp on OS X into apr-1-config. Unfortunately, a lot of versions

of APR have this in the wild so we just have to deal with it. If you use clang

directly you don't see this because we already filter it out of CPPFLAGS.


(SWIG_CPPFLAGS): New variable, deliberately pulling in EXTRA_CPPFLAGS and

not EXTRA_SIWG_CPPFLAGS because it would be harmful to split those

(e.g. users wanting to enable a feature that adds an API).

* build.conf

(swig-python-opts, swig-perl-opts, swig-ruby-opts): Use SWIG_CPPFLAGS

instead of CPPFLAGS.

* configure.acc

(SWIG_CPPFLAGS): Add the variable and copy it from the normal CPPFLAGS

while filtering out the -no-cpp-precomp.

  1. … 2 more files in changeset.

(): don't use the -fwhole-program flag as it is superseded by

-flto and by itself causes issues with llvm

We managed not to propagate configure-time CFLAGS to the makefile.

Fix that, and while there, make sure that gcc/clang-specific compiler

flags (for compilation mode etc.) are only set if Autoconf detects

a GCC-compatible compiler.


initialize from environment.

* (CFLAGS): Add substituted CUSERFLAGS to the definition.


* build/ac-macros/compiler.m4

(SVN_CC_MODE_SETUP, SVN_CXX_MODE_SETUP): Add specific mode flags

only if the corresponding $GCC or $GXX variable is set.


  1. … 2 more files in changeset.
Fix 'make install' broken by faulty FS_X install dependency.


(SVN_LIBSVN_FS_LINKS_FS_X): remove bogus dependency;

add comment about the correct one

Merge fsx branch into /trunk with no conflicts.


  1. … 83 more files in changeset.