mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
Revert "guile: fixed installed-vs-shipped error"
This reverts commit 397f27cdce.
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>
This commit is contained in:
committed by
Richard Purdie
parent
cf72ede74d
commit
b31e6e75ec
@@ -1,39 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@@ -21,7 +21,6 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
|
|||||||
file://arm_endianness.patch \
|
file://arm_endianness.patch \
|
||||||
file://arm_aarch64.patch \
|
file://arm_aarch64.patch \
|
||||||
file://workaround-ice-ssa-corruption.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
|
# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
|
||||||
|
|||||||
Reference in New Issue
Block a user