diff options
| author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-05-08 10:12:13 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 09:37:29 +0100 |
| commit | d67e9bc9df2f95719b3e57629a5638e89da14f70 (patch) | |
| tree | f8df6791aeea16608a358e22ed6f4681d562c9c3 /meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch | |
| parent | 23e850c332504af128a338fae67cf8957bf20bd1 (diff) | |
| download | poky-d67e9bc9df2f95719b3e57629a5638e89da14f70.tar.gz | |
subversion: upgraded to 1.7.9
(From OE-Core rev: 93381809e88f18ce8409a3517eb6b2cb69a42941)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch')
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch | 48 |
1 files changed, 48 insertions, 0 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 new file mode 100644 index 0000000000..fb79b8cc51 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | install-neon-lib should depend on libsvn_delta's installation | ||
| 2 | |||
| 3 | install-neon-lib needs libsvn_delta-1.la which will be regenerated | ||
| 4 | during libsvn_delta-1.la's installation, if libsvn_delta-1.la is | ||
| 5 | in regenerating and at the same time install-neon-lib links it, the | ||
| 6 | error willl happen. | ||
| 7 | |||
| 8 | Let install-neon-lib run after libsvn_delta-1.la is installed will fix | ||
| 9 | the problem. | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 14 | --- | ||
| 15 | build-outputs.mk | 2 +- | ||
| 16 | build.conf | 2 ++ | ||
| 17 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | --- subversion-1.7.6.orig/build-outputs.mk | ||
| 20 | +++ subversion-1.7.6/build-outputs.mk | ||
| 21 | @@ -983,11 +983,11 @@ install-locale: subversion/po/de.mo subv | ||
| 22 | $(MKDIR) $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES | ||
| 23 | cd subversion/po ; $(INSTALL_LOCALE) zh_CN.mo $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES/$(PACKAGE_NAME).mo | ||
| 24 | $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES | ||
| 25 | cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo | ||
| 26 | |||
| 27 | -install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la | ||
| 28 | +install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) | ||
| 29 | $(MKDIR) $(DESTDIR)$(neon_libdir) | ||
| 30 | cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la | ||
| 31 | |||
| 32 | 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 | ||
| 33 | $(MKDIR) $(DESTDIR)$(ramod_libdir) | ||
| 34 | --- subversion-1.7.6.orig/build.conf | ||
| 35 | +++ subversion-1.7.6/build.conf | ||
| 36 | @@ -270,10 +270,12 @@ msvc-export = svn_ra.h private\svn_ra_pr | ||
| 37 | [libsvn_ra_neon] | ||
| 38 | type = ra-module | ||
| 39 | path = subversion/libsvn_ra_neon | ||
| 40 | install = neon-lib | ||
| 41 | libs = libsvn_delta libsvn_subr aprutil apriconv apr neon | ||
| 42 | +# conditionally add more dependencies | ||
| 43 | +add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) | ||
| 44 | msvc-static = yes | ||
| 45 | |||
| 46 | # Accessing repositories via DAV through serf | ||
| 47 | [libsvn_ra_serf] | ||
| 48 | type = ra-module | ||
