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 | |
| parent | 9602318b9d662cd888c9e4d8cd382c6706be4eb1 (diff) | |
| download | openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.tar.gz openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.tar.bz2 openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.tar.xz openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.zip | |
subversion 1.4.5 -> 1.5.5
| -rw-r--r-- | meta/packages/subversion/files/libtool2.patch | 17 | ||||
| -rw-r--r-- | meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch (renamed from meta/packages/subversion/files/disable-revision-install.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/subversion/subversion-1.5.5/libtool2.patch | 15 | ||||
| -rw-r--r-- | meta/packages/subversion/subversion-1.5.5/neon-detection.patch (renamed from meta/packages/subversion/files/neon-detection.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/subversion/subversion_1.5.5.bb (renamed from meta/packages/subversion/subversion_1.4.5.bb) | 2 |
5 files changed, 16 insertions, 18 deletions
diff --git a/meta/packages/subversion/files/libtool2.patch b/meta/packages/subversion/files/libtool2.patch deleted file mode 100644 index a0163fd7f..000000000 --- a/meta/packages/subversion/files/libtool2.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: subversion-1.4.5/configure.in -=================================================================== ---- subversion-1.4.5.orig/configure.in 2009-01-07 17:10:41.000000000 +0000 -+++ subversion-1.4.5/configure.in 2009-01-07 17:13:32.000000000 +0000 -@@ -138,10 +138,10 @@ - echo "using APR's libtool" - sh_libtool="`$apr_config --apr-libtool`" - LIBTOOL="$sh_libtool" - SVN_LIBTOOL="$sh_libtool" - else -- sh_libtool="$abs_builddir/libtool" -- SVN_LIBTOOL="\$(SHELL) $sh_libtool" -+ sh_libtool="$abs_builddir/$host_alias-libtool" -+ SVN_LIBTOOL="\$(abs_builddir)/$host_alias-libtool" - dnl libtoolize requires that the following line not be indented - AC_PROG_LIBTOOL - fi diff --git a/meta/packages/subversion/files/disable-revision-install.patch b/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch index a1c60654c..a1c60654c 100644 --- a/meta/packages/subversion/files/disable-revision-install.patch +++ b/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch 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 000000000..08343b09e --- /dev/null +++ b/meta/packages/subversion/subversion-1.5.5/libtool2.patch @@ -0,0 +1,15 @@ +Index: subversion-1.5.5/configure.ac +=================================================================== +--- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100 ++++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000 +@@ -153,8 +153,8 @@ + LIBTOOL="$sh_libtool" + SVN_LIBTOOL="$sh_libtool" + else +- sh_libtool="$abs_builddir/libtool" +- SVN_LIBTOOL="\$(SHELL) $sh_libtool" ++ sh_libtool="$abs_builddir/$host_alias-libtool" ++ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" + dnl libtoolize requires that the following line not be indented + ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL]) + fi diff --git a/meta/packages/subversion/files/neon-detection.patch b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch index b567d5c05..b567d5c05 100644 --- a/meta/packages/subversion/files/neon-detection.patch +++ b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch diff --git a/meta/packages/subversion/subversion_1.4.5.bb b/meta/packages/subversion/subversion_1.5.5.bb index 40ba53e81..4a1153ce0 100644 --- a/meta/packages/subversion/subversion_1.4.5.bb +++ b/meta/packages/subversion/subversion_1.5.5.bb @@ -5,7 +5,7 @@ RDEPENDS = "neon" LICENSE = "Apache BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r1" +PR = "r4" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ |