diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion/fix-install-depends.patch')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/fix-install-depends.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch deleted file mode 100644 index 6f49ed4bf2..0000000000 --- a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
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 | diff --git a/build-outputs.mk b/build-outputs.mk | ||
20 | --- a/build-outputs.mk | ||
21 | +++ b/build-outputs.mk | ||
22 | @@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv | ||
23 | $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES | ||
24 | cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo | ||
25 | |||
26 | -install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la | ||
27 | +install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) | ||
28 | $(MKDIR) $(DESTDIR)$(neon_libdir) | ||
29 | cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la | ||
30 | |||
31 | diff --git a/build.conf b/build.conf | ||
32 | --- a/build.conf | ||
33 | +++ b/build.conf | ||
34 | @@ -272,6 +272,8 @@ type = ra-module | ||
35 | path = subversion/libsvn_ra_neon | ||
36 | install = neon-lib | ||
37 | libs = libsvn_delta libsvn_subr aprutil apriconv apr neon | ||
38 | +# conditionally add more dependencies | ||
39 | +add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) | ||
40 | msvc-static = yes | ||
41 | |||
42 | # Accessing repositories via DAV through serf | ||
43 | -- | ||
44 | 1.7.10.4 | ||
45 | |||