summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-20 23:17:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-15 12:05:26 +0000
commitd489592092649f2bc5ec116750f580a66eb741fe (patch)
tree7e93000a36d0769910a687b316e3dff94ea4a514
parentb53805792c383822b78a194354d7c33c8fda28c2 (diff)
downloadpoky-d489592092649f2bc5ec116750f580a66eb741fe.tar.gz
subversion: add 1.7.0 with native support and negative D_P for now
* intentionaly with negative D_P, bitbake fetcher should be improved to detect old checkout with newer subversion available or vice versa and do svn upgrade automaticaly or show better error, but subversion as client for target or -native for distributions which explicitly say they want 1.7 (with PREFERRED_VERSION) can be available already from oe-core. * be aware that checkouts from 1.7.0 are not compatible with older subversion clients (ie when builder populating distro PREMIRROR is using 1.7.0 all builders need to have also 1.7.0) * and also 1.7.0 client needs to call svn upgrade in checkout first in order to use it (so if PREMIRROR has tarball from 1.6.x it won't work on client using 1.7.0 unless fetcher2 is improved to detect this and call svn upgrade) * tested on SHR distribution http://wiki.shr-project.org/trac/wiki/Building%20SHR#subversion1.7inshr-chroot * only missing part is to add subversion-native dependency, so that native subversion is built, before building ie elementary (because EFL are using svnversion from configure.ac to detect source revision and .svn dir needs to be from compatible version). * read http://subversion.apache.org/docs/release-notes/1.7.html (From OE-Core rev: d092efd48d831c762747d2f6e1c6018402c3ee0f) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch15
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.7.0.bb37
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
new file mode 100644
index 0000000000..5cd572bfc8
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3--- a/configure.ac 2011-10-20 21:56:02.230663987 +0200
4+++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200
5@@ -227,8 +227,8 @@
6 LIBTOOL="$sh_libtool"
7 SVN_LIBTOOL="$sh_libtool"
8 else
9- sh_libtool="$abs_builddir/libtool"
10- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
11+ sh_libtool="$abs_builddir/$host_alias-libtool"
12+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
13 fi
14 AC_SUBST(SVN_LIBTOOL)
15
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
new file mode 100644
index 0000000000..396b35b883
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
@@ -0,0 +1,37 @@
1DESCRIPTION = "The Subversion (svn) client"
2SECTION = "console/network"
3DEPENDS = "apr-util neon"
4RDEPENDS_${PN} = "neon"
5LICENSE = "Apache-2"
6HOMEPAGE = "http://subversion.tigris.org"
7
8BBCLASSEXTEND = "native"
9
10# negative, because of new checkout format in 1.7.0
11# and distro PREMIRRORs need to be in sync with users
12DEFAULT_PREFERENCE = "-1"
13
14SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
15 file://libtool2.patch \
16"
17SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
18SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
19
20LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
21
22EXTRA_OECONF = " \
23 --without-berkeley-db --without-apxs --without-apache \
24 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
25 --with-apr-util=${STAGING_BINDIR_CROSS}"
26
27inherit autotools
28
29export LDFLAGS += " -L${STAGING_LIBDIR} "
30
31acpaths = "-I build/ -I build/ac-macros/"
32
33do_configure_prepend () {
34 rm -f ${S}/libtool
35 rm -f ${S}/build/libtool.m4
36 sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
37}