diff options
-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, 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 @@ | |||
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: depends on | ||
5 | install-libLTLIBRARIES | ||
6 | |||
7 | It may install such a file: | ||
8 | /usr/lib64/libguile-2.0*-gdb.scm | ||
9 | |||
10 | This is because when there is no file in the directory: | ||
11 | for f in libguile-2.0*; do | ||
12 | [snip] | ||
13 | done | ||
14 | |||
15 | The f would be libguile-2.0* itself. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
20 | --- | ||
21 | libguile/Makefile.am | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/libguile/Makefile.am b/libguile/Makefile.am | ||
25 | index 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 | -- | ||
38 | 1.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 |