summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-16 15:52:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:28 +0000
commitb31e6e75ec0dcc32368edf4f7f7b0d9c310fced7 (patch)
treece59b85000ee20e776071fb80e761a424139d7f2
parentcf72ede74d35746a10d0708942287548f9c72f30 (diff)
downloadpoky-b31e6e75ec0dcc32368edf4f7f7b0d9c310fced7.tar.gz
Revert "guile: fixed installed-vs-shipped error"
This reverts commit 397f27cdceaa4874d8d06aad10cd37a5817d90b8. The fix isn't correct, caused: install: cannot create regular file `/path/to/sysroots/x86_64-linux/usr/lib/libguile-2.0.so.22.7.2': File exists will add a new fix. (From OE-Core rev: d6469ecb0cd13596924a117a9bd5e19cd843c2a9) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch39
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.11.bb1
2 files changed, 0 insertions, 40 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
deleted file mode 100644
index 1045cbe21c..0000000000
--- a/meta/recipes-devtools/guile/files/libguile-Makefile.am-depends.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 9c4e120a7a87db34d22a50883a5a525170b480d7 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 6 Jan 2015 23:10:51 -0800
4Subject: [PATCH] libguile/Makefile.am: install-data-hook: depends on
5 install-libLTLIBRARIES
6
7It may install such a file:
8/usr/lib64/libguile-2.0*-gdb.scm
9
10This is because when there is no file in the directory:
11for f in libguile-2.0*; do
12 [snip]
13done
14
15The f would be libguile-2.0* itself.
16
17Upstream-Status: Pending
18
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20---
21 libguile/Makefile.am | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/libguile/Makefile.am b/libguile/Makefile.am
25index 281faac..fe0a3ba 100644
26--- a/libguile/Makefile.am
27+++ b/libguile/Makefile.am
28@@ -449,7 +449,7 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \
29 install-exec-hook:
30 rm -f $(DESTDIR)$(bindir)/guile-snarf.awk
31
32-install-data-hook: libguile-2.0-gdb.scm
33+install-data-hook: libguile-2.0-gdb.scm install-libLTLIBRARIES
34 @$(MKDIR_P) $(DESTDIR)$(libdir)
35 ## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm.
36 ## SOMETHING is the full name of the final library. We want to ignore
37--
381.7.9.5
39
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb
index f5388aac9b..f2c07599ec 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -21,7 +21,6 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
21 file://arm_endianness.patch \ 21 file://arm_endianness.patch \
22 file://arm_aarch64.patch \ 22 file://arm_aarch64.patch \
23 file://workaround-ice-ssa-corruption.patch \ 23 file://workaround-ice-ssa-corruption.patch \
24 file://libguile-Makefile.am-depends.patch \
25 " 24 "
26 25
27# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 26# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch