summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-07-10 17:35:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-10 20:35:11 +0100
commit5142a1e95ed7db7e09ef31f645d45bb7e380d1d6 (patch)
tree85f8726d00fa572f854d216f148220235a5c7552 /meta/recipes-devtools
parent8af21f1511c22d8696df4952c0ef4baf42f390f1 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/subversion/subversion/fix-install-depends.patch45
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.6.15.bb6
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.7.2.bb3
3 files changed, 51 insertions, 3 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 @@
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
19diff --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
31diff --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--
441.7.10.4
45
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index d3c7392c5c..29029cedb8 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -7,11 +7,13 @@ HOMEPAGE = "http://subversion.tigris.org"
7 7
8BBCLASSEXTEND = "native" 8BBCLASSEXTEND = "native"
9 9
10PR = "r1" 10PR = "r2"
11 11
12SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
13 file://disable-revision-install.patch \ 13 file://disable-revision-install.patch \
14 file://libtool2.patch" 14 file://libtool2.patch \
15 file://fix-install-depends.patch \
16 "
15 17
16SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69" 18SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
17SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45" 19SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index d4d56d051d..ced1b0cdf3 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.2.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
@@ -7,10 +7,11 @@ HOMEPAGE = "http://subversion.tigris.org"
7 7
8BBCLASSEXTEND = "native" 8BBCLASSEXTEND = "native"
9 9
10PR = "r1" 10PR = "r2"
11 11
12SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://libtool2.patch \ 13 file://libtool2.patch \
14 file://fix-install-depends.patch \
14" 15"
15SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8" 16SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8"
16SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517" 17SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517"