diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-18 14:52:03 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-06 22:02:26 +0000 |
commit | bc02b535edb2125a35230e74ffb4f26d91a766ca (patch) | |
tree | 59c76a5a0a0d7265984ac89c2109d803e741db83 /meta/recipes-devtools/subversion/subversion | |
parent | f20cb303aca07d83f510c00c74da3aeb9ef91c85 (diff) | |
download | poky-bc02b535edb2125a35230e74ffb4f26d91a766ca.tar.gz |
subversion: upgrade from 1.5.5 to 1.6.13
And update recipe checksums
rebased neon-detection.patch:
upstream code has some of the changes similar to the changes in the
patch. Removing the duplicate changes from the patch file.
subversion: update LIC_CHKSUM_FILES field
Noticed this change in the COPYING file:
$ diff -u COPYING /tmp/COPYING
--- COPYING 2006-05-28 07:41:18.000000000 -0700
+++ /tmp/COPYING 2010-12-03 11:16:15.000000000 -0800
@@ -10,7 +10,7 @@
on), you may use a newer version instead, at your option.
================================================================
-Copyright (c) 2000-2006 CollabNet. All rights reserved.
+Copyright (c) 2000-2009 CollabNet. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion')
3 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch new file mode 100644 index 0000000000..a1c60654cb --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/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/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch new file mode 100644 index 0000000000..08343b09ec --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/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/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch new file mode 100644 index 0000000000..eaf6de0375 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/neon-detection.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: subversion-1.6.13/build/ac-macros/neon.m4 | ||
2 | =================================================================== | ||
3 | --- subversion-1.6.13.orig/build/ac-macros/neon.m4 | ||
4 | +++ subversion-1.6.13/build/ac-macros/neon.m4 | ||
5 | @@ -42,7 +42,7 @@ AC_DEFUN(SVN_LIB_NEON, | ||
6 | AC_MSG_ERROR([--with-neon requires an argument.]) | ||
7 | fi | ||
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() | ||