diff options
| author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-06-03 14:53:21 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-04 15:53:47 +0100 |
| commit | 6866fd80ec59ef1e2d24263827237be8ff21584f (patch) | |
| tree | 0343758067fa690a4cdec3c4755b3c3ca5c2d0c6 /meta/recipes-devtools/subversion/subversion-1.7.9 | |
| parent | c71a175add6493a2a419e46ab0ef96cbd3fcb70a (diff) | |
| download | openembedded-core-6866fd80ec59ef1e2d24263827237be8ff21584f.tar.gz openembedded-core-6866fd80ec59ef1e2d24263827237be8ff21584f.tar.bz2 openembedded-core-6866fd80ec59ef1e2d24263827237be8ff21584f.zip | |
subversion: upgraded to 1.7.10
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.9')
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.9/libtool2.patch | 15 |
2 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch deleted file mode 100644 index fb79b8cc51..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch +++ /dev/null @@ -1,48 +0,0 @@ -install-neon-lib should depend on libsvn_delta's installation - -install-neon-lib needs libsvn_delta-1.la which will be regenerated -during libsvn_delta-1.la's installation, if libsvn_delta-1.la is -in regenerating and at the same time install-neon-lib links it, the -error willl happen. - -Let install-neon-lib run after libsvn_delta-1.la is installed will fix -the problem. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - build-outputs.mk | 2 +- - build.conf | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- subversion-1.7.6.orig/build-outputs.mk -+++ subversion-1.7.6/build-outputs.mk -@@ -983,11 +983,11 @@ install-locale: subversion/po/de.mo subv - $(MKDIR) $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES - cd subversion/po ; $(INSTALL_LOCALE) zh_CN.mo $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES/$(PACKAGE_NAME).mo - $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES - cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo - --install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la -+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) - $(MKDIR) $(DESTDIR)$(neon_libdir) - cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la - - install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la - $(MKDIR) $(DESTDIR)$(ramod_libdir) ---- subversion-1.7.6.orig/build.conf -+++ subversion-1.7.6/build.conf -@@ -270,10 +270,12 @@ msvc-export = svn_ra.h private\svn_ra_pr - [libsvn_ra_neon] - type = ra-module - path = subversion/libsvn_ra_neon - install = neon-lib - libs = libsvn_delta libsvn_subr aprutil apriconv apr neon -+# conditionally add more dependencies -+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) - msvc-static = yes - - # Accessing repositories via DAV through serf - [libsvn_ra_serf] - type = ra-module diff --git a/meta/recipes-devtools/subversion/subversion-1.7.9/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.9/libtool2.patch deleted file mode 100644 index 5cd572bfc8..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.9/libtool2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - ---- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 -+++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 -@@ -227,8 +227,8 @@ - LIBTOOL="$sh_libtool" - SVN_LIBTOOL="$sh_libtool" - else -- sh_libtool="$abs_builddir/libtool" -- SVN_LIBTOOL="\$(SHELL) $sh_libtool" -+ sh_libtool="$abs_builddir/$host_alias-libtool" -+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" - fi - AC_SUBST(SVN_LIBTOOL) - |