diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-01-31 10:15:11 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-02 17:55:01 +0000 |
| commit | 32121906e704952fe122834c142da45012af40e8 (patch) | |
| tree | d1e16c3236a21214100e4d0dd8968b274ce20538 /meta/recipes-devtools/subversion/subversion | |
| parent | adfa6c40dadebb18bfd457859300d8c093b007f7 (diff) | |
| download | ast2050-yocto-poky-32121906e704952fe122834c142da45012af40e8.zip ast2050-yocto-poky-32121906e704952fe122834c142da45012af40e8.tar.gz | |
subversion: upgrade from 1.6.13 to 1.6 15
Rebased this patch to the newer code
modified: subversion/disable-revision-install.patch
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion')
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion/disable-revision-install.patch | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch index a1c6065..ad716d0 100644 --- a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch +++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch @@ -1,6 +1,8 @@ ---- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200 -+++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200 -@@ -260,7 +260,7 @@ +Index: subversion-1.6.15/Makefile.in +=================================================================== +--- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800 ++++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686 -0800 +@@ -305,7 +305,7 @@ clean: external-clean local-clean distclean: external-distclean local-distclean extraclean: external-extraclean local-extraclean @@ -9,14 +11,24 @@ @INCLUDE_OUTPUTS@ -@@ -320,8 +320,8 @@ +@@ -363,13 +363,13 @@ local-install: @INSTALL_RULES@ ### HACK!! Find a better way to do this -revision-install: -- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt +- test -d $(DESTDIR)$(includedir)/subversion-1 || \ +- $(MKDIR) $(DESTDIR)$(includedir)/subversion-1 +- (subversion/svnversion/svnversion $(top_srcdir) || \ +- svnversion $(top_srcdir) || \ +- echo "unknown"; \ +- ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt +#revision-install: -+# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt ++# test -d $(DESTDIR)$(includedir)/subversion-1 || \ ++# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1 ++# (subversion/svnversion/svnversion $(top_srcdir) || \ ++# svnversion $(top_srcdir) || \ ++# echo "unknown"; \ ++# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt install-static: @INSTALL_STATIC_RULES@ |
