summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch')
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
deleted file mode 100644
index fb79b8cc51..0000000000
--- a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1install-neon-lib should depend on libsvn_delta's installation
2
3install-neon-lib needs libsvn_delta-1.la which will be regenerated
4during libsvn_delta-1.la's installation, if libsvn_delta-1.la is
5in regenerating and at the same time install-neon-lib links it, the
6error willl happen.
7
8Let install-neon-lib run after libsvn_delta-1.la is installed will fix
9the problem.
10
11Upstream-Status: Pending
12
13Signed-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