From 32121906e704952fe122834c142da45012af40e8 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 31 Jan 2011 10:15:11 -0800 Subject: 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 --- .../subversion/disable-revision-install.patch | 24 +++++++++++---- .../subversion/subversion_1.6.13.bb | 35 ---------------------- .../subversion/subversion_1.6.15.bb | 35 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion_1.6.13.bb create mode 100644 meta/recipes-devtools/subversion/subversion_1.6.15.bb (limited to 'meta/recipes-devtools/subversion') diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch index a1c60654cb..ad716d05ff 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@ diff --git a/meta/recipes-devtools/subversion/subversion_1.6.13.bb b/meta/recipes-devtools/subversion/subversion_1.6.13.bb deleted file mode 100644 index b535f06a61..0000000000 --- a/meta/recipes-devtools/subversion/subversion_1.6.13.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS_${PN} = "neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" - -PR = "r1" - -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" - -LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -acpaths = "-I build/ -I build/ac-macros/" - -do_configure_prepend () { - rm -f ${S}/libtool - rm -f ${S}/build/libtool.m4 - sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 -} diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb new file mode 100644 index 0000000000..de40863cf5 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util neon" +RDEPENDS_${PN} = "neon" +LICENSE = "Apache BSD" +HOMEPAGE = "http://subversion.tigris.org" + +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] = "113fca1d9e4aa389d7dc2b210010fa69" +SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45" + +LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" + +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ + --without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ + --with-apr-util=${STAGING_BINDIR_CROSS}" + +inherit autotools + +export LDFLAGS += " -L${STAGING_LIBDIR} " + +acpaths = "-I build/ -I build/ac-macros/" + +do_configure_prepend () { + rm -f ${S}/libtool + rm -f ${S}/build/libtool.m4 + sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 +} -- cgit v1.2.3-54-g00ecf