diff options
| author | Klaus Kurzmann <mok@fluxnetz.de> | 2011-12-06 14:43:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-07 12:40:51 +0000 |
| commit | aa9d0de4225fe482ddbf1486f8018bc87419e228 (patch) | |
| tree | aca3d7e6eb3ce972133865675747c3ce2d61f983 /meta | |
| parent | 97a57aca12437c24b628071bb189c9f3b94e27ca (diff) | |
| download | openembedded-core-aa9d0de4225fe482ddbf1486f8018bc87419e228.tar.gz openembedded-core-aa9d0de4225fe482ddbf1486f8018bc87419e228.tar.bz2 openembedded-core-aa9d0de4225fe482ddbf1486f8018bc87419e228.zip | |
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 <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')
| -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" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ " -SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04" -SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978" +SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8" +SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517" LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4" @@ -32,6 +32,7 @@ acpaths = "-I build/ -I build/ac-macros/" do_configure_prepend () { rm -f ${S}/libtool - rm -f ${S}/build/libtool.m4 + 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 + rm -f ${S}/aclocal.m4 sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 } |