summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2012-08-14 13:56:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:21 +0100
commitfb187e7f3bb9a8d4a96e574307973397a94064f0 (patch)
tree512a0a207b186dcdbe8f1f218abd4120d7954c30
parent4c70d7e84924ce3e02336b1ad36231f735c37c10 (diff)
downloadpoky-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.bb7
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.7.2.bb5
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 @@
1DESCRIPTION = "The Subversion (svn) client" 1DESCRIPTION = "The Subversion (svn) client"
2SECTION = "console/network" 2SECTION = "console/network"
3DEPENDS = "apr-util neon" 3DEPENDS = "apr-util neon sqlite3"
4RDEPENDS_${PN} = "neon" 4RDEPENDS_${PN} = "neon"
5LICENSE = "Apache-2" 5LICENSE = "Apache-2"
6HOMEPAGE = "http://subversion.tigris.org" 6HOMEPAGE = "http://subversion.tigris.org"
7 7
8BBCLASSEXTEND = "native" 8BBCLASSEXTEND = "native"
9 9
10PR = "r2" 10PR = "r3"
11 11
12SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ 12SRC_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"
23EXTRA_OECONF = " \ 23EXTRA_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
28inherit autotools 29inherit 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
8BBCLASSEXTEND = "native" 8BBCLASSEXTEND = "native"
9 9
10PR = "r3" 10PR = "r4"
11 11
12SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_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"
21EXTRA_OECONF = " \ 21EXTRA_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
26inherit autotools 27inherit autotools
27 28