From 7db7440fbfa6945f83687e10962f77f59a70f343 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Mon, 26 Sep 2011 14:13:37 -0600 Subject: [PATCH] Make LXC binaries search the right place for libraries --- packages/lxc/lxc.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/lxc/lxc.mk b/packages/lxc/lxc.mk index 5d37df2..e8edc3e 100644 --- a/packages/lxc/lxc.mk +++ b/packages/lxc/lxc.mk @@ -31,13 +31,14 @@ $(LXC_BUILDDIR)/source: $(LXC_TAR) lxc-build: $(LXC_BUILDDIR)/built $(LXC_BUILDDIR)/built: $(LXC_BUILDDIR)/source libcap-build - cd $(LXC_SRCDIR) && CFLAGS="$(LIBCAP_CFLAGS)" LDFLAGS="$(LIBCAP_LDFLAGS)" ./configure $(CONFIG_XCOMPILE_FLAGS) - LD_RUN_PATH=/opt/lxc/lib $(MAKE) -C $(LXC_SRCDIR) + cd $(LXC_SRCDIR) && CFLAGS="$(LIBCAP_CFLAGS)" LDFLAGS="$(LIBCAP_LDFLAGS) -Xlinker -rpath -Xlinker /opt/lxc/lib" ./configure $(CONFIG_XCOMPILE_FLAGS) + $(MAKE) -C $(LXC_SRCDIR) touch $@ lxc-install: lxc-build mkdir -p $(LXC_PKGDIR)/lib - cp $(LXC_SRCDIR)/src/lxc/liblxc.so $(LXC_PKGDIR)/lib + cp $(LXC_SRCDIR)/src/lxc/liblxc.so $(LXC_PKGDIR)/lib/liblxc.so.0 + cp $(LIBCAP_SRCDIR)/libcap/libcap.so.* $(LXC_PKGDIR)/lib mkdir -p $(LXC_PKGDIR)/bin cp $(LXC_PROGRAMS) $(LXC_PKGDIR)/bin