diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-07-10 17:35:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-10 20:35:11 +0100 |
commit | 5142a1e95ed7db7e09ef31f645d45bb7e380d1d6 (patch) | |
tree | 85f8726d00fa572f854d216f148220235a5c7552 /meta/recipes-devtools/subversion/subversion | |
parent | 8af21f1511c22d8696df4952c0ef4baf42f390f1 (diff) | |
download | poky-5142a1e95ed7db7e09ef31f645d45bb7e380d1d6.tar.gz |
subversion: do_install failed (parallel issue)
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.
The error message is:
/bin/ld: cannot find -lsvn_delta-1
collect2: error: ld returned 1 exit status
This is a parallel issue, so it doesn't happen often.
Note:
The autoreconf doesn't generate build-outputs.mk, it would be generated
by autogen.sh (use build.conf as the input), but autogen.sh isn't
suitable for cross compiling, so both modified build-outputs.mk and
build.conf.
[YOCTO #2727]
(From OE-Core rev: ce37c45abb4cf43e5009867f695982de2eb33450)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/fix-install-depends.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch new file mode 100644 index 0000000000..6f49ed4bf2 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/fix-install-depends.patch | |||
@@ -0,0 +1,45 @@ | |||
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 | |||