diff options
Diffstat (limited to 'meta/recipes-devtools/subversion')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.7.0.bb | 37 |
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch new file mode 100644 index 000000000..5cd572bfc --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [embedded specific] + +--- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 ++++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 +@@ -227,8 +227,8 @@ + LIBTOOL="$sh_libtool" + SVN_LIBTOOL="$sh_libtool" + else +- sh_libtool="$abs_builddir/libtool" +- SVN_LIBTOOL="\$(SHELL) $sh_libtool" ++ sh_libtool="$abs_builddir/$host_alias-libtool" ++ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" + fi + AC_SUBST(SVN_LIBTOOL) + diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb new file mode 100644 index 000000000..396b35b88 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion_1.7.0.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util neon" +RDEPENDS_${PN} = "neon" +LICENSE = "Apache-2" +HOMEPAGE = "http://subversion.tigris.org" + +BBCLASSEXTEND = "native" + +# negative, because of new checkout format in 1.7.0 +# and distro PREMIRRORs need to be in sync with users +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://libtool2.patch \ +" +SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04" +SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978" + +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}" + +inherit autotools + +export LDFLAGS += " -L${STAGING_LIBDIR} " + +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 +} |