diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-07 17:22:15 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-07 17:22:15 +0000 |
commit | eb72830fcf40b195e72fad06ca7e470565c21d8b (patch) | |
tree | ee5292f0881ff0e5cd700b22392a43cac27e722c /meta/packages/subversion | |
parent | 30238161a6ad7bb6f7a91d589567e1dd5b0196c7 (diff) | |
download | poky-eb72830fcf40b195e72fad06ca7e470565c21d8b.tar.gz |
Add apr, apt-util and subversion based on recipes from OE with tweaks from Josh/me
Diffstat (limited to 'meta/packages/subversion')
-rw-r--r-- | meta/packages/subversion/files/disable-revision-install.patch | 22 | ||||
-rw-r--r-- | meta/packages/subversion/files/libtool2.patch | 17 | ||||
-rw-r--r-- | meta/packages/subversion/files/neon-detection.patch | 36 | ||||
-rw-r--r-- | meta/packages/subversion/subversion_1.4.5.bb | 29 |
4 files changed, 104 insertions, 0 deletions
diff --git a/meta/packages/subversion/files/disable-revision-install.patch b/meta/packages/subversion/files/disable-revision-install.patch new file mode 100644 index 0000000000..a1c60654cb --- /dev/null +++ b/meta/packages/subversion/files/disable-revision-install.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | --- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200 | ||
2 | +++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200 | ||
3 | @@ -260,7 +260,7 @@ | ||
4 | clean: external-clean local-clean | ||
5 | distclean: external-distclean local-distclean | ||
6 | extraclean: external-extraclean local-extraclean | ||
7 | -install: external-install local-install revision-install | ||
8 | +install: external-install local-install #revision-install | ||
9 | |||
10 | @INCLUDE_OUTPUTS@ | ||
11 | |||
12 | @@ -320,8 +320,8 @@ | ||
13 | local-install: @INSTALL_RULES@ | ||
14 | |||
15 | ### HACK!! Find a better way to do this | ||
16 | -revision-install: | ||
17 | - subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt | ||
18 | +#revision-install: | ||
19 | +# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt | ||
20 | |||
21 | install-static: @INSTALL_STATIC_RULES@ | ||
22 | |||
diff --git a/meta/packages/subversion/files/libtool2.patch b/meta/packages/subversion/files/libtool2.patch new file mode 100644 index 0000000000..a0163fd7f5 --- /dev/null +++ b/meta/packages/subversion/files/libtool2.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Index: subversion-1.4.5/configure.in | ||
2 | =================================================================== | ||
3 | --- subversion-1.4.5.orig/configure.in 2009-01-07 17:10:41.000000000 +0000 | ||
4 | +++ subversion-1.4.5/configure.in 2009-01-07 17:13:32.000000000 +0000 | ||
5 | @@ -138,10 +138,10 @@ | ||
6 | echo "using APR's libtool" | ||
7 | sh_libtool="`$apr_config --apr-libtool`" | ||
8 | LIBTOOL="$sh_libtool" | ||
9 | SVN_LIBTOOL="$sh_libtool" | ||
10 | else | ||
11 | - sh_libtool="$abs_builddir/libtool" | ||
12 | - SVN_LIBTOOL="\$(SHELL) $sh_libtool" | ||
13 | + sh_libtool="$abs_builddir/$host_alias-libtool" | ||
14 | + SVN_LIBTOOL="\$(abs_builddir)/$host_alias-libtool" | ||
15 | dnl libtoolize requires that the following line not be indented | ||
16 | AC_PROG_LIBTOOL | ||
17 | fi | ||
diff --git a/meta/packages/subversion/files/neon-detection.patch b/meta/packages/subversion/files/neon-detection.patch new file mode 100644 index 0000000000..b567d5c050 --- /dev/null +++ b/meta/packages/subversion/files/neon-detection.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4 | ||
2 | index 9fcf859..8d964f3 100644 | ||
3 | --- a/build/ac-macros/neon.m4 | ||
4 | +++ b/build/ac-macros/neon.m4 | ||
5 | @@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON, | ||
6 | if test "$withval" = "yes" ; then | ||
7 | AC_MSG_ERROR([--with-neon requires an argument.]) | ||
8 | else | ||
9 | - neon_config="$withval/bin/neon-config" | ||
10 | + neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" | ||
11 | fi | ||
12 | |||
13 | SVN_NEON_CONFIG() | ||
14 | @@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG() | ||
15 | dnl neon-config found, gather relevant information from it | ||
16 | AC_DEFUN(SVN_NEON_CONFIG, | ||
17 | [ | ||
18 | - if test -f "$neon_config"; then | ||
19 | - if test "$neon_config" != ""; then | ||
20 | + if true; then | ||
21 | + if true; then | ||
22 | AC_MSG_CHECKING([neon library version]) | ||
23 | - NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` | ||
24 | + NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'` | ||
25 | AC_MSG_RESULT([$NEON_VERSION]) | ||
26 | |||
27 | if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then | ||
28 | @@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG, | ||
29 | test "$svn_allowed_neon" = "any"; then | ||
30 | svn_allowed_neon_on_system="yes" | ||
31 | SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] | ||
32 | - NEON_LIBS=`$neon_config --la-file` | ||
33 | + NEON_LIBS=`$neon_config --libs` | ||
34 | CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] | ||
35 | svn_lib_neon="yes" | ||
36 | break | ||
diff --git a/meta/packages/subversion/subversion_1.4.5.bb b/meta/packages/subversion/subversion_1.4.5.bb new file mode 100644 index 0000000000..40ba53e813 --- /dev/null +++ b/meta/packages/subversion/subversion_1.4.5.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "The Subversion (svn) client" | ||
2 | SECTION = "console/network" | ||
3 | DEPENDS = "apr-util neon" | ||
4 | RDEPENDS = "neon" | ||
5 | LICENSE = "Apache BSD" | ||
6 | HOMEPAGE = "http://subversion.tigris.org" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ | ||
11 | file://disable-revision-install.patch;patch=1 \ | ||
12 | file://neon-detection.patch;patch=1 \ | ||
13 | file://libtool2.patch;patch=1" | ||
14 | |||
15 | EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ | ||
16 | --without-berkeley-db --without-apxs --without-apache \ | ||
17 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ | ||
18 | --with-apr-util=${STAGING_BINDIR_CROSS}" | ||
19 | |||
20 | inherit autotools_stage | ||
21 | |||
22 | export LDFLAGS += " -L${STAGING_LIBDIR} " | ||
23 | |||
24 | acpaths = "-I build/ -I build/ac-macros/" | ||
25 | |||
26 | do_configure_prepend () { | ||
27 | rm -f ${S}/libtool | ||
28 | rm -f ${S}/build/libtool.m4 | ||
29 | } | ||