summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion
diff options
context:
space:
mode:
authorKlaus Kurzmann <mok@fluxnetz.de>2011-12-06 14:43:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-08 15:24:11 +0000
commita8dd9bc19d2156a9c9a593de517b63170dc2f567 (patch)
tree1ce43421ec4d9ff4a898831a003051013b6bb9a4 /meta/recipes-devtools/subversion
parentf17e0ae38b2e6c4cbe7f0f9d76c3e1a386335fd1 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch (renamed from meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch)0
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.7.2.bb (renamed from meta/recipes-devtools/subversion/subversion_1.7.0.bb)7
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch
index 5cd572bfc8..5cd572bfc8 100644
--- a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
+++ b/meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index 396b35b883..23e21327e4 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.0.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
@@ -14,8 +14,8 @@ DEFAULT_PREFERENCE = "-1"
14SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 14SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
15 file://libtool2.patch \ 15 file://libtool2.patch \
16" 16"
17SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04" 17SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8"
18SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978" 18SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517"
19 19
20LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4" 20LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
21 21
@@ -32,6 +32,7 @@ acpaths = "-I build/ -I build/ac-macros/"
32 32
33do_configure_prepend () { 33do_configure_prepend () {
34 rm -f ${S}/libtool 34 rm -f ${S}/libtool
35 rm -f ${S}/build/libtool.m4 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
36 sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 37 sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
37} 38}