[OE-core] [PATCH] subversion: two small fixes
rongqing.li at windriver.com
rongqing.li at windriver.com
Tue Aug 14 05:56:56 UTC 2012
From: Roy.Li <rongqing.li at windriver.com>
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.
Signed-off-by: Roy.Li <rongqing.li at windriver.com>
---
.../subversion/subversion_1.6.15.bb | 7 ++++---
.../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 29029ce..244d7ea 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 @@
DESCRIPTION = "The Subversion (svn) client"
SECTION = "console/network"
-DEPENDS = "apr-util neon"
+DEPENDS = "apr-util neon sqlite3"
RDEPENDS_${PN} = "neon"
LICENSE = "Apache-2"
HOMEPAGE = "http://subversion.tigris.org"
BBCLASSEXTEND = "native"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
file://disable-revision-install.patch \
@@ -23,7 +23,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
EXTRA_OECONF = " \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
- --with-apr-util=${STAGING_BINDIR_CROSS}"
+ --with-apr-util=${STAGING_BINDIR_CROSS} \
+ ac_cv_path_RUBY=none"
inherit autotools
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index 4f71de5..1d36b63 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"
BBCLASSEXTEND = "native"
-PR = "r3"
+PR = "r4"
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://libtool2.patch \
@@ -21,7 +21,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
EXTRA_OECONF = " \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
- --with-apr-util=${STAGING_BINDIR_CROSS}"
+ --with-apr-util=${STAGING_BINDIR_CROSS} \
+ ac_cv_path_RUBY=none"
inherit autotools
--
1.7.4.1
More information about the Openembedded-core
mailing list