diff options
author | Roy.Li <rongqing.li@windriver.com> | 2012-08-14 13:56:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 18:04:21 +0100 |
commit | fb187e7f3bb9a8d4a96e574307973397a94064f0 (patch) | |
tree | 512a0a207b186dcdbe8f1f218abd4120d7954c30 | |
parent | 4c70d7e84924ce3e02336b1ad36231f735c37c10 (diff) | |
download | poky-fb187e7f3bb9a8d4a96e574307973397a94064f0.tar.gz |
subversion: two small fixes
Add missing build dependency on sqlite3
Disable Ruby checking. we do not have Ruby, and subversion always
checks ruby on host which leads to build error when ruby-dev is
installed on host.
(From OE-Core rev: d712e596cbfae59fd21096090de7fc4ac8d086e7)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.6.15.bb | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.7.2.bb | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index 29029cedb8..244d7ea81a 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | DESCRIPTION = "The Subversion (svn) client" | 1 | DESCRIPTION = "The Subversion (svn) client" |
2 | SECTION = "console/network" | 2 | SECTION = "console/network" |
3 | DEPENDS = "apr-util neon" | 3 | DEPENDS = "apr-util neon sqlite3" |
4 | RDEPENDS_${PN} = "neon" | 4 | RDEPENDS_${PN} = "neon" |
5 | LICENSE = "Apache-2" | 5 | LICENSE = "Apache-2" |
6 | HOMEPAGE = "http://subversion.tigris.org" | 6 | HOMEPAGE = "http://subversion.tigris.org" |
7 | 7 | ||
8 | BBCLASSEXTEND = "native" | 8 | BBCLASSEXTEND = "native" |
9 | 9 | ||
10 | PR = "r2" | 10 | PR = "r3" |
11 | 11 | ||
12 | SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ |
13 | file://disable-revision-install.patch \ | 13 | file://disable-revision-install.patch \ |
@@ -23,7 +23,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" | |||
23 | EXTRA_OECONF = " \ | 23 | EXTRA_OECONF = " \ |
24 | --without-berkeley-db --without-apxs --without-apache \ | 24 | --without-berkeley-db --without-apxs --without-apache \ |
25 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ | 25 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ |
26 | --with-apr-util=${STAGING_BINDIR_CROSS}" | 26 | --with-apr-util=${STAGING_BINDIR_CROSS} \ |
27 | ac_cv_path_RUBY=none" | ||
27 | 28 | ||
28 | inherit autotools | 29 | inherit autotools |
29 | 30 | ||
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb index 4f71de5a17..1d36b63eba 100644 --- a/meta/recipes-devtools/subversion/subversion_1.7.2.bb +++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "http://subversion.tigris.org" | |||
7 | 7 | ||
8 | BBCLASSEXTEND = "native" | 8 | BBCLASSEXTEND = "native" |
9 | 9 | ||
10 | PR = "r3" | 10 | PR = "r4" |
11 | 11 | ||
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 \ |
@@ -21,7 +21,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4" | |||
21 | EXTRA_OECONF = " \ | 21 | EXTRA_OECONF = " \ |
22 | --without-berkeley-db --without-apxs --without-apache \ | 22 | --without-berkeley-db --without-apxs --without-apache \ |
23 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ | 23 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ |
24 | --with-apr-util=${STAGING_BINDIR_CROSS}" | 24 | --with-apr-util=${STAGING_BINDIR_CROSS} \ |
25 | ac_cv_path_RUBY=none" | ||
25 | 26 | ||
26 | inherit autotools | 27 | inherit autotools |
27 | 28 | ||