diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-08 11:29:31 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-08 11:29:31 +0000 |
commit | 1daca591dd32df7e810fe279c75296cac437dfa8 (patch) | |
tree | 3819b15ee086b57e6a21aecd04109121bcfc4c13 /meta/packages/subversion/subversion-1.5.5 | |
parent | 9602318b9d662cd888c9e4d8cd382c6706be4eb1 (diff) | |
download | poky-1daca591dd32df7e810fe279c75296cac437dfa8.tar.gz |
subversion 1.4.5 -> 1.5.5
Diffstat (limited to 'meta/packages/subversion/subversion-1.5.5')
3 files changed, 73 insertions, 0 deletions
diff --git a/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch b/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch new file mode 100644 index 0000000000..a1c60654cb --- /dev/null +++ b/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | --- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200 | ||
2 | +++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200 | ||
3 | @@ -260,7 +260,7 @@ | ||
4 | clean: external-clean local-clean | ||
5 | distclean: external-distclean local-distclean | ||
6 | extraclean: external-extraclean local-extraclean | ||
7 | -install: external-install local-install revision-install | ||
8 | +install: external-install local-install #revision-install | ||
9 | |||
10 | @INCLUDE_OUTPUTS@ | ||
11 | |||
12 | @@ -320,8 +320,8 @@ | ||
13 | local-install: @INSTALL_RULES@ | ||
14 | |||
15 | ### HACK!! Find a better way to do this | ||
16 | -revision-install: | ||
17 | - subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt | ||
18 | +#revision-install: | ||
19 | +# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt | ||
20 | |||
21 | install-static: @INSTALL_STATIC_RULES@ | ||
22 | |||
diff --git a/meta/packages/subversion/subversion-1.5.5/libtool2.patch b/meta/packages/subversion/subversion-1.5.5/libtool2.patch new file mode 100644 index 0000000000..08343b09ec --- /dev/null +++ b/meta/packages/subversion/subversion-1.5.5/libtool2.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: subversion-1.5.5/configure.ac | ||
2 | =================================================================== | ||
3 | --- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100 | ||
4 | +++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000 | ||
5 | @@ -153,8 +153,8 @@ | ||
6 | LIBTOOL="$sh_libtool" | ||
7 | SVN_LIBTOOL="$sh_libtool" | ||
8 | else | ||
9 | - sh_libtool="$abs_builddir/libtool" | ||
10 | - SVN_LIBTOOL="\$(SHELL) $sh_libtool" | ||
11 | + sh_libtool="$abs_builddir/$host_alias-libtool" | ||
12 | + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" | ||
13 | dnl libtoolize requires that the following line not be indented | ||
14 | ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL]) | ||
15 | fi | ||
diff --git a/meta/packages/subversion/subversion-1.5.5/neon-detection.patch b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch new file mode 100644 index 0000000000..b567d5c050 --- /dev/null +++ b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4 | ||
2 | index 9fcf859..8d964f3 100644 | ||
3 | --- a/build/ac-macros/neon.m4 | ||
4 | +++ b/build/ac-macros/neon.m4 | ||
5 | @@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON, | ||
6 | if test "$withval" = "yes" ; then | ||
7 | AC_MSG_ERROR([--with-neon requires an argument.]) | ||
8 | else | ||
9 | - neon_config="$withval/bin/neon-config" | ||
10 | + neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" | ||
11 | fi | ||
12 | |||
13 | SVN_NEON_CONFIG() | ||
14 | @@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG() | ||
15 | dnl neon-config found, gather relevant information from it | ||
16 | AC_DEFUN(SVN_NEON_CONFIG, | ||
17 | [ | ||
18 | - if test -f "$neon_config"; then | ||
19 | - if test "$neon_config" != ""; then | ||
20 | + if true; then | ||
21 | + if true; then | ||
22 | AC_MSG_CHECKING([neon library version]) | ||
23 | - NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` | ||
24 | + NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'` | ||
25 | AC_MSG_RESULT([$NEON_VERSION]) | ||
26 | |||
27 | if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then | ||
28 | @@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG, | ||
29 | test "$svn_allowed_neon" = "any"; then | ||
30 | svn_allowed_neon_on_system="yes" | ||
31 | SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] | ||
32 | - NEON_LIBS=`$neon_config --la-file` | ||
33 | + NEON_LIBS=`$neon_config --libs` | ||
34 | CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] | ||
35 | svn_lib_neon="yes" | ||
36 | break | ||