sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Nitin A Kamble 2011-01-31 10:15:11 -08:00 committed by Richard Purdie
parent adfa6c40da
commit 32121906e7
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
View File

@ -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@

6
meta/recipes-devtools/subversion/subversion_1.6.13.bb → meta/recipes-devtools/subversion/subversion_1.6.15.bb
View File

@ -5,15 +5,15 @@ RDEPENDS_${PN} = "neon"
LICENSE = "Apache BSD"
HOMEPAGE = "http://subversion.tigris.org"
PR = "r1"
PR = "r0"
SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1 \
file://libtool2.patch;patch=1"
SRC_URI[md5sum] = "7ae1c827689f21cf975804005be30aeb"
SRC_URI[sha256sum] = "3a30327bdb04109f369586196ee4a6993cdab2cfa85c3134549f02c229bf0d15"
SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"