diff options
author | Klaus Kurzmann <mok@fluxnetz.de> | 2011-12-06 14:43:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-08 15:24:11 +0000 |
commit | a8dd9bc19d2156a9c9a593de517b63170dc2f567 (patch) | |
tree | 1ce43421ec4d9ff4a898831a003051013b6bb9a4 /meta/recipes-devtools/subversion/subversion_1.7.2.bb | |
parent | f17e0ae38b2e6c4cbe7f0f9d76c3e1a386335fd1 (diff) | |
download | poky-a8dd9bc19d2156a9c9a593de517b63170dc2f567.tar.gz |
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.
(From OE-Core rev: aa9d0de4225fe482ddbf1486f8018bc87419e228)
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion_1.7.2.bb')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.7.2.bb | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb new file mode 100644 index 0000000000..23e21327e4 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | DESCRIPTION = "The Subversion (svn) client" | ||
2 | SECTION = "console/network" | ||
3 | DEPENDS = "apr-util neon" | ||
4 | RDEPENDS_${PN} = "neon" | ||
5 | LICENSE = "Apache-2" | ||
6 | HOMEPAGE = "http://subversion.tigris.org" | ||
7 | |||
8 | BBCLASSEXTEND = "native" | ||
9 | |||
10 | # negative, because of new checkout format in 1.7.0 | ||
11 | # and distro PREMIRRORs need to be in sync with users | ||
12 | DEFAULT_PREFERENCE = "-1" | ||
13 | |||
14 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | ||
15 | file://libtool2.patch \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8" | ||
18 | SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517" | ||
19 | |||
20 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4" | ||
21 | |||
22 | EXTRA_OECONF = " \ | ||
23 | --without-berkeley-db --without-apxs --without-apache \ | ||
24 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ | ||
25 | --with-apr-util=${STAGING_BINDIR_CROSS}" | ||
26 | |||
27 | inherit autotools | ||
28 | |||
29 | export LDFLAGS += " -L${STAGING_LIBDIR} " | ||
30 | |||
31 | acpaths = "-I build/ -I build/ac-macros/" | ||
32 | |||
33 | do_configure_prepend () { | ||
34 | rm -f ${S}/libtool | ||
35 | rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4 | ||
36 | rm -f ${S}/aclocal.m4 | ||
37 | sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 | ||
38 | } | ||