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:36:28 +0000 |
commit | 940c4179cca43567cea31967ea6600aeea5687aa (patch) | |
tree | 9ea1297dfaf3793cf3e959851716876b105d2fb6 /meta/recipes-devtools/guile/files | |
parent | b31e6e75ec0dcc32368edf4f7f7b0d9c310fced7 (diff) | |
download | poky-940c4179cca43567cea31967ea6600aeea5687aa.tar.gz |
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.
(From OE-Core rev: 482c0c44e6efffed826cbc621a039dd0950847f8)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/guile/files')
-rw-r--r-- | meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch | 42 |
1 files changed, 42 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 @@ | |||
1 | From 9c4e120a7a87db34d22a50883a5a525170b480d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 6 Jan 2015 23:10:51 -0800 | ||
4 | Subject: [PATCH] libguile/Makefile.am: install-data-hook -> install-exec-hook | ||
5 | |||
6 | It may install such a file: | ||
7 | /usr/lib64/libguile-2.0*-gdb.scm | ||
8 | |||
9 | This is because when there is no file in the directory: | ||
10 | for f in libguile-2.0*; do | ||
11 | [snip] | ||
12 | done | ||
13 | |||
14 | The f would be libguile-2.0* itself, use install-exec-hook will fix the | ||
15 | problem since it depends on install-libLTLIBRARIES. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
20 | --- | ||
21 | libguile/Makefile.am | 4 +--- | ||
22 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
23 | |||
24 | diff --git a/libguile/Makefile.am b/libguile/Makefile.am | ||
25 | index 5decd99..52645b7 100644 | ||
26 | --- a/libguile/Makefile.am | ||
27 | +++ b/libguile/Makefile.am | ||
28 | @@ -446,10 +446,8 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \ | ||
29 | ## delete guile-snarf.awk from the installation bindir, in case it's | ||
30 | ## lingering there due to an earlier guile version not having been | ||
31 | ## wiped out. | ||
32 | -install-exec-hook: | ||
33 | +install-exec-hook: libguile-2.0-gdb.scm | ||
34 | rm -f $(DESTDIR)$(bindir)/guile-snarf.awk | ||
35 | - | ||
36 | -install-data-hook: libguile-2.0-gdb.scm | ||
37 | @$(MKDIR_P) $(DESTDIR)$(libdir) | ||
38 | ## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm. | ||
39 | ## SOMETHING is the full name of the final library. We want to ignore | ||
40 | -- | ||
41 | 1.7.9.5 | ||
42 | |||