qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] Improvements to libtool support.


From: Brad
Subject: Re: [Qemu-devel] [PATCH] Improvements to libtool support.
Date: Sat, 20 Aug 2011 18:36:16 -0400
User-agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.5; en-US; rv:1.9.2.20) Gecko/20110804 Thunderbird/3.1.12

On 13/08/11 8: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<address@hidden>

Alon?

---
  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


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]