diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-07 06:55:03 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-11 17:39:49 +0000 |
| commit | f6305b451fd5f13e62642b8ac34edc0e6ab19542 (patch) | |
| tree | 1f6dc03abbafea729d02ffae350f5738f1e3d8c2 /meta/recipes-devtools | |
| parent | c78a9246a1aae14a1598d4c801faaf27dd31f66a (diff) | |
| download | openembedded-core-f6305b451fd5f13e62642b8ac34edc0e6ab19542.tar.gz openembedded-core-f6305b451fd5f13e62642b8ac34edc0e6ab19542.tar.bz2 openembedded-core-f6305b451fd5f13e62642b8ac34edc0e6ab19542.zip | |
guile: fixed installed-vs-shipped error
Fixed:
guile-2.0.11: guile: Files/directories were installed but not shipped
/usr/lib64/libguile-2.0*-gdb.scm [installed-vs-shipped]
This is because when there is no file in the directory:
for f in libguile-2.0*; do
[snip]
done
The f would be libguile-2.0* itself, make sure the libs are installed
firstly will fix the problem.
(From OE-Core rev: adf32ca3d0657cb5d363ae7a3fdb539c6627cf39)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.11.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch b/meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch new file mode 100644 index 0000000000..1045cbe21c --- /dev/null +++ b/meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch @@ -0,0 +1,39 @@ +From 9c4e120a7a87db34d22a50883a5a525170b480d7 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 6 Jan 2015 23:10:51 -0800 +Subject: [PATCH] libguile/Makefile.am: install-data-hook: depends on + install-libLTLIBRARIES + +It may install such a file: +/usr/lib64/libguile-2.0*-gdb.scm + +This is because when there is no file in the directory: +for f in libguile-2.0*; do + [snip] +done + +The f would be libguile-2.0* itself. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + libguile/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libguile/Makefile.am b/libguile/Makefile.am +index 281faac..fe0a3ba 100644 +--- a/libguile/Makefile.am ++++ b/libguile/Makefile.am +@@ -449,7 +449,7 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \ + install-exec-hook: + rm -f $(DESTDIR)$(bindir)/guile-snarf.awk + +-install-data-hook: libguile-2.0-gdb.scm ++install-data-hook: libguile-2.0-gdb.scm install-libLTLIBRARIES + @$(MKDIR_P) $(DESTDIR)$(libdir) + ## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm. + ## SOMETHING is the full name of the final library. We want to ignore +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb index bd23c2b918..8fda850fc2 100644 --- a/meta/recipes-devtools/guile/guile_2.0.11.bb +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb @@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \ file://guile_2.0.6_fix_sed_error.patch \ file://arm_endianness.patch \ file://workaround-ice-ssa-corruption.patch \ + file://libguile-Makefile.am-depends.patch \ " # file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch |