diff options
author | Steffen Sledz <sledz@dresearch-fe.de> | 2012-10-03 14:06:09 +0200 |
---|---|---|
committer | Steffen Sledz <sledz@dresearch-fe.de> | 2012-10-03 14:15:28 +0200 |
commit | b2fa6d8d2452a312c3a9cec3ad122d1e3195e8bd (patch) | |
tree | a01264fb01961cb4c7e6cee4b4088e909386cbbb /recipes/subversion/files/fix-install-depends.patch | |
parent | a35ceaacb2019750dc9f4b4fd5ea927cf2ad47fb (diff) | |
download | openembedded-b2fa6d8d2452a312c3a9cec3ad122d1e3195e8bd.tar.gz |
subversion-1.6.5: fix QA issue
This patch fixes the QA issue
ERROR: This autoconf log indicates errors, it looked at host includes.
by backporting some build related patches and recipe modifications
from oe-core.
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Diffstat (limited to 'recipes/subversion/files/fix-install-depends.patch')
-rw-r--r-- | recipes/subversion/files/fix-install-depends.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes/subversion/files/fix-install-depends.patch b/recipes/subversion/files/fix-install-depends.patch new file mode 100644 index 0000000000..6f49ed4bf2 --- /dev/null +++ b/recipes/subversion/files/fix-install-depends.patch @@ -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 + |