diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-08-06 13:55:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-07 07:43:47 +0100 |
commit | f63e7f4323368c0d6fe7a1d44393a7e15652d4f2 (patch) | |
tree | 221f24ac2309664bb990bea604b1684916de596f /meta/recipes-devtools/subversion | |
parent | 7616bea24c9537db254a9161043a7dae9eb461f0 (diff) | |
download | poky-f63e7f4323368c0d6fe7a1d44393a7e15652d4f2.tar.gz |
subversion: Add patch to use neon 0.30
The neon update is not recognized but subversion, so we need to patch the configure.ac
to know about 0.30, otherwise we don't have http/https support in subversion.
(From OE-Core rev: 291ab168fac15eae0e4c9234e16f394b0e1547a0)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch | 20 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.7.10.bb | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch new file mode 100644 index 0000000000..e8acb12a21 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | |||
2 | Allow neon 0.30 to be usable also | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | Index: subversion-1.7.10/configure.ac | ||
9 | =================================================================== | ||
10 | --- subversion-1.7.10.orig/configure.ac | ||
11 | +++ subversion-1.7.10/configure.ac | ||
12 | @@ -118,7 +118,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config) | ||
13 | |||
14 | # Either a space-separated list of allowable Neon versions, or "any" to | ||
15 | # mean allow anything. | ||
16 | -NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29" | ||
17 | +NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30" | ||
18 | NEON_RECOMMENDED_VER="0.29.6" | ||
19 | NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" | ||
20 | dnl You can skip the neon version check only if you know what you are doing | ||
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb index a24edb5d23..f77656ba68 100644 --- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb +++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb | |||
@@ -12,6 +12,7 @@ inherit gettext | |||
12 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 12 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
13 | file://libtool2.patch \ | 13 | file://libtool2.patch \ |
14 | file://fix-install-depends.patch \ | 14 | file://fix-install-depends.patch \ |
15 | file://allow-updated-neon.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200" | 17 | SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200" |
17 | SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7" | 18 | SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7" |