[OE-core] [PATCH][oe-core 2/3] subversion: update 1.7.0 to 1.7.1 and force libtool recreation
Martin Jansa
martin.jansa at gmail.com
Tue Dec 6 08:35:20 UTC 2011
From: Klaus Kurzmann <mok at fluxnetz.de>
* 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 at fluxnetz.de>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../libtool2.patch | 0
.../{subversion_1.7.0.bb => subversion_1.7.1.bb} | 7 ++++---
2 files changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/subversion/{subversion-1.7.0 => subversion-1.7.1}/libtool2.patch (100%)
rename meta/recipes-devtools/subversion/{subversion_1.7.0.bb => subversion_1.7.1.bb} (75%)
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.1/libtool2.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion-1.7.1/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.1.bb
similarity index 75%
rename from meta/recipes-devtools/subversion/subversion_1.7.0.bb
rename to meta/recipes-devtools/subversion/subversion_1.7.1.bb
index 396b35b..a99e087 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.0.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.1.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] = "8a4fa74385df85a9702141b6b68b8307"
+SRC_URI[sha256sum] = "d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608"
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
}
--
1.7.8
More information about the Openembedded-core
mailing list