libconfig installs in /lib, should be /lib64

libconfig installs in /lib, should be /lib64

[Andre Przywara]

Hi,

the libconfig shipped with libxl is put in the /usr/lib directory (at 
least on my setup). Since the library is ELF64, it should go into 
/usr/lib64 - as all the other Xen libraries do.
I have no idea of the autotools / Makefile magic to do this (and don't 
feel like learning about it this afternoon), so I hope someone else can 
fix this. The default Xen libraries include $(XEN_ROOT)/tools/Rules.mk, 
which eventually pulls in LIB_DIR from x86_{32,64}.mk, which contains 
the correct directory. But I don't see an easy way to inject this into 
the autotools setup of libconfig.
The same issue is with the pkgconfig directory, which also should reside 
below lib64 as well as the path written in the .pc file itself.

Regards,
Andre.

-- 
Andre Przywara
AMD-Operating System Research Center (OSRC), Dresden, Germany
Tel: +49 351 448 3567 12
----to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd; Thomas M. McCoy; Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

Re: libconfig installs in /lib, should be /lib64

[Stefano Stabellini]

On Fri, 22 Jan 2010, Andre Przywara wrote:
> Hi,
> 
> the libconfig shipped with libxl is put in the /usr/lib directory (at 
> least on my setup). Since the library is ELF64, it should go into 
> /usr/lib64 - as all the other Xen libraries do.
> I have no idea of the autotools / Makefile magic to do this (and don't 
> feel like learning about it this afternoon), so I hope someone else can 
> fix this. The default Xen libraries include $(XEN_ROOT)/tools/Rules.mk, 
> which eventually pulls in LIB_DIR from x86_{32,64}.mk, which contains 
> the correct directory. But I don't see an easy way to inject this into 
> the autotools setup of libconfig.
> The same issue is with the pkgconfig directory, which also should reside 
> below lib64 as well as the path written in the .pc file itself.
> 

Thanks for point out this issue, this patch should fix it.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

---

diff -r 4978b4a4bbb6 tools/libxl/Makefile
--- a/tools/libxl/Makefile	Fri Jan 22 13:32:26 2010 +0000
+++ b/tools/libxl/Makefile	Fri Jan 22 15:21:29 2010 +0000
@@ -44,7 +44,7 @@
 
 $(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz
 	[ ! -d "$(LIBCONFIG_SOURCE)" ] && tar xzf $<
-	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(DESTDIR)$(PREFIX) --disable-cxx && $(MAKE)
+	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(DESTDIR)$(PREFIX) --libdir=$(DESTDIR)$(LIBDIR) --disable-cxx && $(MAKE)
 
 xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so xl.c
 	$(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c

Re: libconfig installs in /lib, should be /lib64

[Stefano Stabellini]

On Fri, 22 Jan 2010, Stefano Stabellini wrote:
> On Fri, 22 Jan 2010, Andre Przywara wrote:
> > Hi,
> > 
> > the libconfig shipped with libxl is put in the /usr/lib directory (at 
> > least on my setup). Since the library is ELF64, it should go into 
> > /usr/lib64 - as all the other Xen libraries do.
> > I have no idea of the autotools / Makefile magic to do this (and don't 
> > feel like learning about it this afternoon), so I hope someone else can 
> > fix this. The default Xen libraries include $(XEN_ROOT)/tools/Rules.mk, 
> > which eventually pulls in LIB_DIR from x86_{32,64}.mk, which contains 
> > the correct directory. But I don't see an easy way to inject this into 
> > the autotools setup of libconfig.
> > The same issue is with the pkgconfig directory, which also should reside 
> > below lib64 as well as the path written in the .pc file itself.
> > 
> 
> Thanks for point out this issue, this patch should fix it.
> 

Please forget the patch I have just sent, I think this one is better.


Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

---


diff -r 4978b4a4bbb6 tools/libxl/Makefile
--- a/tools/libxl/Makefile	Fri Jan 22 13:32:26 2010 +0000
+++ b/tools/libxl/Makefile	Fri Jan 22 15:28:33 2010 +0000
@@ -44,7 +44,7 @@
 
 $(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz
 	[ ! -d "$(LIBCONFIG_SOURCE)" ] && tar xzf $<
-	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(DESTDIR)$(PREFIX) --disable-cxx && $(MAKE)
+	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --disable-cxx && $(MAKE)
 
 xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so xl.c
 	$(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c
@@ -60,7 +60,7 @@
 	ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
 	$(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR)
-	cd $(LIBCONFIG_SOURCE) && DESTDIR= $(MAKE) install
+	cd $(LIBCONFIG_SOURCE) && DESTDIR=$(DESTDIR) $(MAKE) install
 
 .PHONY: clean
 clean:

Re: Re: libconfig installs in /lib, should be /lib64

[Ian Campbell]

On Fri, 2010-01-22 at 15:31 +0000, Stefano Stabellini wrote:
> On Fri, 22 Jan 2010, Stefano Stabellini wrote:
> > On Fri, 22 Jan 2010, Andre Przywara wrote:
> > > Hi,
> > > 
> > > the libconfig shipped with libxl is put in the /usr/lib directory (at 
> > > least on my setup). Since the library is ELF64, it should go into 
> > > /usr/lib64 - as all the other Xen libraries do.
> > > I have no idea of the autotools / Makefile magic to do this (and don't 
> > > feel like learning about it this afternoon), so I hope someone else can 
> > > fix this. The default Xen libraries include $(XEN_ROOT)/tools/Rules.mk, 
> > > which eventually pulls in LIB_DIR from x86_{32,64}.mk, which contains 
> > > the correct directory. But I don't see an easy way to inject this into 
> > > the autotools setup of libconfig.
> > > The same issue is with the pkgconfig directory, which also should reside 
> > > below lib64 as well as the path written in the .pc file itself.
> > > 
> > 
> > Thanks for point out this issue, this patch should fix it.
> > 
> 
> Please forget the patch I have just sent, I think this one is better.
> 
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

ACK. This is the correct way to deal with DESTDIR for non-broken build
systems and also fixes an issue with my local build scripts where
libconfig would be installed to /tmp/tmplovntY/usr/lib/.

Tested-by: Ian Campbell <ian.campbell@citrix.com>

> 
> ---
> 
> 
> diff -r 4978b4a4bbb6 tools/libxl/Makefile
> --- a/tools/libxl/Makefile	Fri Jan 22 13:32:26 2010 +0000
> +++ b/tools/libxl/Makefile	Fri Jan 22 15:28:33 2010 +0000
> @@ -44,7 +44,7 @@
>  
>  $(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz
>  	[ ! -d "$(LIBCONFIG_SOURCE)" ] && tar xzf $<
> -	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(DESTDIR)$(PREFIX) --disable-cxx && $(MAKE)
> +	cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --disable-cxx && $(MAKE)
>  
>  xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so xl.c
>  	$(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c
> @@ -60,7 +60,7 @@
>  	ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
>  	$(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
>  	$(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR)
> -	cd $(LIBCONFIG_SOURCE) && DESTDIR= $(MAKE) install
> +	cd $(LIBCONFIG_SOURCE) && DESTDIR=$(DESTDIR) $(MAKE) install
>  
>  .PHONY: clean
>  clean:
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel