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>
This commit is contained in:
parent
8af21f1511
commit
5142a1e95e
|
@ -0,0 +1,45 @@
|
||||||
|
install-neon-lib should depend on libsvn_delta's installation
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Let install-neon-lib run after libsvn_delta-1.la is installed will fix
|
||||||
|
the problem.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
---
|
||||||
|
build-outputs.mk | 2 +-
|
||||||
|
build.conf | 2 ++
|
||||||
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/build-outputs.mk b/build-outputs.mk
|
||||||
|
--- a/build-outputs.mk
|
||||||
|
+++ b/build-outputs.mk
|
||||||
|
@@ -979,7 +979,7 @@ install-locale: subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subv
|
||||||
|
$(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES
|
||||||
|
cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo
|
||||||
|
|
||||||
|
-install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
|
||||||
|
+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS)
|
||||||
|
$(MKDIR) $(DESTDIR)$(neon_libdir)
|
||||||
|
cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la
|
||||||
|
|
||||||
|
diff --git a/build.conf b/build.conf
|
||||||
|
--- a/build.conf
|
||||||
|
+++ b/build.conf
|
||||||
|
@@ -272,6 +272,8 @@ type = ra-module
|
||||||
|
path = subversion/libsvn_ra_neon
|
||||||
|
install = neon-lib
|
||||||
|
libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
|
||||||
|
+# conditionally add more dependencies
|
||||||
|
+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
|
||||||
|
msvc-static = yes
|
||||||
|
|
||||||
|
# Accessing repositories via DAV through serf
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
|
@ -7,11 +7,13 @@ HOMEPAGE = "http://subversion.tigris.org"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
|
SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
|
||||||
file://disable-revision-install.patch \
|
file://disable-revision-install.patch \
|
||||||
file://libtool2.patch"
|
file://libtool2.patch \
|
||||||
|
file://fix-install-depends.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
|
SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
|
||||||
SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
|
SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
|
||||||
|
|
|
@ -7,10 +7,11 @@ HOMEPAGE = "http://subversion.tigris.org"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||||
file://libtool2.patch \
|
file://libtool2.patch \
|
||||||
|
file://fix-install-depends.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8"
|
SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8"
|
||||||
SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517"
|
SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517"
|
||||||
|
|
Loading…
Reference in New Issue