summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion/subversion
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion')
-rw-r--r--meta/recipes-devtools/subversion/subversion/disable-revision-install.patch22
-rw-r--r--meta/recipes-devtools/subversion/subversion/libtool2.patch15
-rw-r--r--meta/recipes-devtools/subversion/subversion/neon-detection.patch13
3 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
new file mode 100644
index 0000000000..a1c60654cb
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/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/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch
new file mode 100644
index 0000000000..08343b09ec
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/libtool2.patch
@@ -0,0 +1,15 @@
1Index: subversion-1.5.5/configure.ac
2===================================================================
3--- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100
4+++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000
5@@ -153,8 +153,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 dnl libtoolize requires that the following line not be indented
14 ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
15 fi
diff --git a/meta/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch
new file mode 100644
index 0000000000..eaf6de0375
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/neon-detection.patch
@@ -0,0 +1,13 @@
1Index: subversion-1.6.13/build/ac-macros/neon.m4
2===================================================================
3--- subversion-1.6.13.orig/build/ac-macros/neon.m4
4+++ subversion-1.6.13/build/ac-macros/neon.m4
5@@ -42,7 +42,7 @@ AC_DEFUN(SVN_LIB_NEON,
6 AC_MSG_ERROR([--with-neon requires an argument.])
7 fi
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()