[lxc-devel] [lxc/master] Tweak libtool handling to work with Android

stgraber on Github lxc-bot at linuxcontainers.org
Tue Oct 25 20:58:50 UTC 2016


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161025/06fbef64/attachment.bin>
-------------- next part --------------
From f4790f1f612df18f3b933de3de52e3f0bfbc0fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 25 Oct 2016 16:39:56 -0400
Subject: [PATCH] Tweak libtool handling to work with Android
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 src/lxc/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 8138a56..6bcb6da 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -298,8 +298,8 @@ endif
 install-exec-local: install-libLTLIBRARIES
 	mkdir -p $(DESTDIR)$(datadir)/lxc
 	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
-	rm $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.1
-	mv $(DESTDIR)$(libdir)/liblxc.so.1.0.0 $(DESTDIR)$(libdir)/liblxc.so. at LXC_ABI@
+	mv $(shell readlink -f $(DESTDIR)$(libdir)/liblxc.so) $(DESTDIR)$(libdir)/liblxc.so. at LXC_ABI@
+	rm -f $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.1
 	cd $(DESTDIR)$(libdir); \
 	ln -sf liblxc.so. at LXC_ABI@ liblxc.so.$(firstword $(subst ., , at LXC_ABI@)); \
 	ln -sf liblxc.so.$(firstword $(subst ., , at LXC_ABI@)) liblxc.so


More information about the lxc-devel mailing list