From a8dd9bc19d2156a9c9a593de517b63170dc2f567 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Tue, 6 Dec 2011 14:43:15 +0100 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- .../subversion/subversion-1.7.0/libtool2.patch | 15 --------- .../subversion/subversion-1.7.2/libtool2.patch | 15 +++++++++ .../subversion/subversion_1.7.0.bb | 37 --------------------- .../subversion/subversion_1.7.2.bb | 38 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch delete mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.2.bb (limited to 'meta/recipes-devtools/subversion') diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch deleted file mode 100644 index 5cd572bfc8..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - ---- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 -+++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 -@@ -227,8 +227,8 @@ - LIBTOOL="$sh_libtool" - SVN_LIBTOOL="$sh_libtool" - else -- sh_libtool="$abs_builddir/libtool" -- SVN_LIBTOOL="\$(SHELL) $sh_libtool" -+ sh_libtool="$abs_builddir/$host_alias-libtool" -+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" - fi - AC_SUBST(SVN_LIBTOOL) - diff --git a/meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch new file mode 100644 index 0000000000..5cd572bfc8 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [embedded specific] + +--- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 ++++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 +@@ -227,8 +227,8 @@ + LIBTOOL="$sh_libtool" + SVN_LIBTOOL="$sh_libtool" + else +- sh_libtool="$abs_builddir/libtool" +- SVN_LIBTOOL="\$(SHELL) $sh_libtool" ++ sh_libtool="$abs_builddir/$host_alias-libtool" ++ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" + fi + AC_SUBST(SVN_LIBTOOL) + diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb deleted file mode 100644 index 396b35b883..0000000000 --- a/meta/recipes-devtools/subversion/subversion_1.7.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS_${PN} = "neon" -LICENSE = "Apache-2" -HOMEPAGE = "http://subversion.tigris.org" - -BBCLASSEXTEND = "native" - -# negative, because of new checkout format in 1.7.0 -# and distro PREMIRRORs need to be in sync with users -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://libtool2.patch \ -" -SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04" -SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4" - -EXTRA_OECONF = " \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -acpaths = "-I build/ -I build/ac-macros/" - -do_configure_prepend () { - rm -f ${S}/libtool - rm -f ${S}/build/libtool.m4 - sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 -} 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 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util neon" +RDEPENDS_${PN} = "neon" +LICENSE = "Apache-2" +HOMEPAGE = "http://subversion.tigris.org" + +BBCLASSEXTEND = "native" + +# negative, because of new checkout format in 1.7.0 +# and distro PREMIRRORs need to be in sync with users +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://libtool2.patch \ +" +SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8" +SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4" + +EXTRA_OECONF = " \ + --without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ + --with-apr-util=${STAGING_BINDIR_CROSS}" + +inherit autotools + +export LDFLAGS += " -L${STAGING_LIBDIR} " + +acpaths = "-I build/ -I build/ac-macros/" + +do_configure_prepend () { + rm -f ${S}/libtool + 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 +} -- cgit 1.2.3-korg