mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

subversion: update 1.7.0 to 1.7.2 and force libtool recreation

Browse Source 
* 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>
This commit is contained in:
Klaus Kurzmann
2011-12-06 14:43:15 +01:00
committed by Richard Purdie
parent f17e0ae38b
commit a8dd9bc19d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch → meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch
View File

7
meta/recipes-devtools/subversion/subversion_1.7.0.bb → meta/recipes-devtools/subversion/subversion_1.7.2.bb
View File

@@ -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
}