CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

guile: fixed installed-vs-shipped error

Browse Source 
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)

(From OE-Core rev: f6305b451fd5f13e62642b8ac34edc0e6ab19542)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-01-07 06:55:03 -08:00 committed by Richard Purdie
parent 0cf128ca1b
commit 6c3ccc8ae9
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch Normal file
View File

@ -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

1
meta/recipes-devtools/guile/guile_2.0.11.bb
View File

@ -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