diff options
| author |   Tom Rini <trini@ti.com> | 2012-10-09 07:40:00 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-09 07:40:00 -0700 |
| commit | 0be6fd399bc7dcb9f9c87a9416aa2dbc0563b613 (patch) | |
| tree | 9a652bd2efc76fefdc5c4aed48906ab6e125094e /recipes/subversion/subversion_1.6.5.bb | |
| parent | a828cea6b5def8abe4dbfca236d8190ae6946f4f (diff) | |
| parent | b2fa6d8d2452a312c3a9cec3ad122d1e3195e8bd (diff) | |
| download | openembedded-0be6fd399bc7dcb9f9c87a9416aa2dbc0563b613.tar.gz | |
Merge branch 'pull-request-2' of git://github.com/sledz/oe into 2011.03-maintenance
Diffstat (limited to 'recipes/subversion/subversion_1.6.5.bb')
| -rw-r--r-- | recipes/subversion/subversion_1.6.5.bb | 21 |
1 files changed, 14 insertions, 7 deletions
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" |