From aa9d0de4225fe482ddbf1486f8018bc87419e228 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Tue, 6 Dec 2011 14:43:15 +0100 Subject: subversion: update 1.7.0 to 1.7.2 and force libtool recreation * subversion-1.7.* had libtool-2.4, oe-core now has 2.4.2 and it was failing: x86_64-linux-libtool: Version mismatch error. This is libtool 2.4.2, but the x86_64-linux-libtool: definition of this LT_INIT comes from libtool 2.4. x86_64-linux-libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2 x86_64-linux-libtool: and run autoconf again. Signed-off-by: Klaus Kurzmann Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- .../subversion/subversion_1.7.0.bb | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb (limited to 'meta/recipes-devtools/subversion/subversion_1.7.0.bb') diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb deleted file mode 100644 index 396b35b88..000000000 --- a/meta/recipes-devtools/subversion/subversion_1.7.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -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 -} -- cgit v1.2.3