From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:32821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvXQx-0002Fr-U9 for qemu-devel@nongnu.org; Mon, 22 Aug 2011 12:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvXQw-0003IQ-Qe for qemu-devel@nongnu.org; Mon, 22 Aug 2011 12:33:07 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:50390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvXQw-0003Gd-Js for qemu-devel@nongnu.org; Mon, 22 Aug 2011 12:33:06 -0400 Received: by mail-yw0-f45.google.com with SMTP id 9so4301504ywf.4 for ; Mon, 22 Aug 2011 09:33:01 -0700 (PDT) Message-ID: <4E5284BB.9060204@codemonkey.ws> Date: Mon, 22 Aug 2011 11:32:59 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <20110814003014.GA8665@rox.home.comstyle.com> In-Reply-To: <20110814003014.GA8665@rox.home.comstyle.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Improvements to libtool support. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Brad Cc: qemu-devel@nongnu.org On 08/13/2011 07:30 PM, Brad wrote: > Improvements to the libtool support in QEMU. Replace hard coded > libtool in the infrastructure with $(LIBTOOL) and allow > overriding the libtool binary used via the configure > script. > > Signed-off-by: Brad Smith Applied. Thanks. Regards, Anthony Liguori > > --- > Makefile.objs | 2 +- > configure | 5 ++--- > libcacard/Makefile | 10 +++++----- > rules.mak | 2 +- > 4 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/Makefile.objs b/Makefile.objs > index 16eef38..6c0be08 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -369,7 +369,7 @@ trace-dtrace.lo: trace-dtrace.dtrace > @echo "missing libtool. please install and rerun configure."; exit 1 > else > trace-dtrace.lo: trace-dtrace.dtrace > - $(call quiet-command,libtool --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN trace-dtrace.o") > + $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN trace-dtrace.o") > endif > > simpletrace.o: simpletrace.c $(GENERATED_HEADERS) > diff --git a/configure b/configure > index 6c77067..eb7497b 100755 > --- a/configure > +++ b/configure > @@ -224,6 +224,7 @@ cc="${CC-${cross_prefix}gcc}" > ar="${AR-${cross_prefix}ar}" > objcopy="${OBJCOPY-${cross_prefix}objcopy}" > ld="${LD-${cross_prefix}ld}" > +libtool="${LIBTOOL-${cross_prefix}libtool}" > strip="${STRIP-${cross_prefix}strip}" > windres="${WINDRES-${cross_prefix}windres}" > pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}" > @@ -1341,10 +1342,8 @@ fi > ########################################## > # libtool probe > > -if ! has libtool; then > +if ! has $libtool; then > libtool= > -else > - libtool=libtool > fi > > ########################################## > diff --git a/libcacard/Makefile b/libcacard/Makefile > index fe9747a..56dc974 100644 > --- a/libcacard/Makefile > +++ b/libcacard/Makefile > @@ -37,7 +37,7 @@ install-libcacard: > @echo "libtool is missing, please install and rerun configure"; exit 1 > else > libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) > - $(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) $(libcacard_libs) -lrt -rpath $(libdir) -o $@ $^," lt LINK $@") > + $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) $(libcacard_libs) -lrt -rpath $(libdir) -o $@ $^," lt LINK $@") > > libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in > sed -e 's|@LIBDIR@|$(libdir)|' \ > @@ -53,10 +53,10 @@ install-libcacard: libcacard.pc libcacard.la vscclient > $(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" > $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" > $(INSTALL_DIR) "$(DESTDIR)$(bindir)" > - libtool --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" > - libtool --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" > - libtool --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" > + $(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" > + $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" > + $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" > for inc in *.h; do \ > - libtool --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ > + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ > done > endif > diff --git a/rules.mak b/rules.mak > index 1a2622c..884d421 100644 > --- a/rules.mak > +++ b/rules.mak > @@ -22,7 +22,7 @@ ifeq ($(LIBTOOL),) > @echo "missing libtool. please install and rerun configure"; exit 1 > else > %.lo: %.c > - $(call quiet-command,libtool --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") > + $(call quiet-command,$(LIBTOOL) --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") > endif > > %.o: %.S