diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-07 06:55:03 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:35:25 +0000 |
| commit | 482c0c44e6efffed826cbc621a039dd0950847f8 (patch) | |
| tree | 958c0046b68e802daa39be32231736f433e1421e /meta/recipes-devtools | |
| parent | d6469ecb0cd13596924a117a9bd5e19cd843c2a9 (diff) | |
| download | openembedded-core-482c0c44e6efffed826cbc621a039dd0950847f8.tar.gz openembedded-core-482c0c44e6efffed826cbc621a039dd0950847f8.tar.bz2 openembedded-core-482c0c44e6efffed826cbc621a039dd0950847f8.zip | |
guile: fix 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, use install-exec-hook will fix the
problem since it depends on install-libLTLIBRARIES.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.11.bb | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch b/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch new file mode 100644 index 0000000000..290b9d447d --- /dev/null +++ b/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch @@ -0,0 +1,42 @@ +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 -> install-exec-hook + +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, use install-exec-hook will fix the +problem since it depends on install-libLTLIBRARIES. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + libguile/Makefile.am | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libguile/Makefile.am b/libguile/Makefile.am +index 5decd99..52645b7 100644 +--- a/libguile/Makefile.am ++++ b/libguile/Makefile.am +@@ -446,10 +446,8 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \ + ## delete guile-snarf.awk from the installation bindir, in case it's + ## lingering there due to an earlier guile version not having been + ## wiped out. +-install-exec-hook: ++install-exec-hook: libguile-2.0-gdb.scm + rm -f $(DESTDIR)$(bindir)/guile-snarf.awk +- +-install-data-hook: libguile-2.0-gdb.scm + @$(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 f2c07599ec..d1578e08cf 100644 --- a/meta/recipes-devtools/guile/guile_2.0.11.bb +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb @@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \ file://arm_endianness.patch \ file://arm_aarch64.patch \ file://workaround-ice-ssa-corruption.patch \ + file://libguile-Makefile.am-hook.patch \ " # file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch |