From b2fa6d8d2452a312c3a9cec3ad122d1e3195e8bd Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 3 Oct 2012 14:06:09 +0200 Subject: subversion-1.6.5: fix QA issue This patch fixes the QA issue ERROR: This autoconf log indicates errors, it looked at host includes. by backporting some build related patches and recipe modifications from oe-core. Signed-off-by: Steffen Sledz --- recipes/subversion/subversion_1.6.5.bb | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'recipes/subversion/subversion_1.6.5.bb') diff --git a/recipes/subversion/subversion_1.6.5.bb b/recipes/subversion/subversion_1.6.5.bb index 51ec72473d..2a563ca5cd 100644 --- a/recipes/subversion/subversion_1.6.5.bb +++ b/recipes/subversion/subversion_1.6.5.bb @@ -5,23 +5,30 @@ RDEPENDS_${PN} = "neon" LICENSE = "Apache BSD" HOMEPAGE = "http://subversion.tigris.org/" -PR = "r1" +PR = "r2" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch" + file://disable-revision-install.patch \ + file://libtool2.patch \ + file://fix-install-depends.patch \ + " 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 -acpaths = "-I build/ac-macros" +export LDFLAGS += " -L${STAGING_LIBDIR} " -# FIXME: Ugly hack! -do_configure_append() { - if ! test -f libtool ; then cp -a *-libtool libtool ; fi +acpaths = "-I build/ -I build/ac-macros/" + +do_configure_prepend () { + rm -f ${S}/libtool + rm -f ${S}/build/libtool.m4 + sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 } SRC_URI[md5sum] = "1a53a0e72bee0bf814f4da83a9b6a636" -- cgit 1.2.3-korg