summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-19 12:00:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-21 09:34:40 +0100
commitdc4d7bb8f7c67f1b70e29367e2520a50b8a09fe6 (patch)
treebc7194f3e65f1b94675512490a4689d3e20d815e
parent5f12e1841af2195e7a1fa6d4deab4415245cd2be (diff)
downloadpoky-dc4d7bb8f7c67f1b70e29367e2520a50b8a09fe6.tar.gz
subversion: 1.9.7 -> 1.10.0
License changed since licenses for the bundled linenoise and lz4 codebases were added. We don't build either of them. Add MIT since utf8proc is MIT licensed. Configure to use the internal utf8proc codebase since we have no copy of that in OE-Core, nor any need to add one. Add a dependency on lz4 which is now required rather than using the internal codebase within subversion. Drop a patch merged upstream. (From OE-Core rev: 5bb47984af79fe2e8c3ba5bc6895741131f03bcd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.10.0.bb (renamed from meta/recipes-devtools/subversion/subversion_1.9.7.bb)12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/subversion/subversion_1.9.7.bb b/meta/recipes-devtools/subversion/subversion_1.10.0.bb
index da9de9d5b9..82454ae63c 100644
--- a/meta/recipes-devtools/subversion/subversion_1.9.7.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.10.0.bb
@@ -1,21 +1,20 @@
1SUMMARY = "Subversion (svn) version control system client" 1SUMMARY = "Subversion (svn) version control system client"
2HOMEPAGE = "http://subversion.tigris.org" 2HOMEPAGE = "http://subversion.tigris.org"
3SECTION = "console/network" 3SECTION = "console/network"
4LICENSE = "Apache-2" 4LICENSE = "Apache-2 & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=83206f39819e7a4dfca2ff7c190f6ce0"
6 6
7DEPENDS = "apr-util serf sqlite3 file" 7DEPENDS = "apr-util serf sqlite3 file lz4"
8DEPENDS_append_class-native = " file-replacement-native" 8DEPENDS_append_class-native = " file-replacement-native"
9 9
10SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 10SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
11 file://disable_macos.patch \ 11 file://disable_macos.patch \
12 file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
13 file://0001-Fix-libtool-name-in-configure.ac.patch \ 12 file://0001-Fix-libtool-name-in-configure.ac.patch \
14 file://serfmacro.patch \ 13 file://serfmacro.patch \
15 " 14 "
16 15
17SRC_URI[md5sum] = "05b0c677681073920f938c1f322e0be2" 16SRC_URI[md5sum] = "0126847f9e8cb8ed0b90a6a18b203309"
18SRC_URI[sha256sum] = "c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623" 17SRC_URI[sha256sum] = "2cf23f3abb837dea0585a6b0ebd70e80e01f95bddef7c1aa097c18e3eaa6b584"
19 18
20inherit autotools pkgconfig gettext 19inherit autotools pkgconfig gettext
21 20
@@ -31,6 +30,7 @@ EXTRA_OECONF = " \
31 --without-berkeley-db \ 30 --without-berkeley-db \
32 --without-swig \ 31 --without-swig \
33 --disable-keychain \ 32 --disable-keychain \
33 --with-utf8proc=internal \
34 ac_cv_path_RUBY=none \ 34 ac_cv_path_RUBY=none \
35" 35"
36 36