From 7af8e1e0da4d9515818ec940e50558615d11ded5 Mon Sep 17 00:00:00 2001 From: aliguori Date: Sun, 5 Apr 2009 17:41:02 +0000 Subject: [PATCH] Make binary stripping conditional (Riku Voipio) Currently qemu unconditionally strips binaries on install. This is a problem for packagers who may want to store/ship debug symbols of compiled packages for debugging purposes. Keep stripping as default for the oldtimers and add a --disable-strip flag to override. (cherry picked from commit 1625af873aa8c9e4d22ad50a08e877110bf40623) Signed-off-by: Riku Voipio Signed-off-by: Anthony Liguori Signed-off-by: Mark McLoughlin Fedora-patch: qemu-fix-debuginfo.patch --- Makefile | 2 +- configure | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fa1afdc8fd..297625ea57 100644 --- a/Makefile +++ b/Makefile @@ -256,7 +256,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" diff --git a/configure b/configure index e00893f128..2fed69242a 100755 --- a/configure +++ b/configure @@ -165,6 +165,7 @@ kvm_version() { gprof="no" sparse="no" +strip_opt="yes" bigendian="no" mingw32="no" EXESUF="" @@ -416,6 +417,8 @@ for opt do ;; --disable-sparse) sparse="no" ;; + --disable-strip) strip_opt="no" + ;; --disable-vnc-tls) vnc_tls="no" ;; --disable-vnc-sasl) vnc_sasl="no" @@ -571,6 +574,7 @@ echo " --install=INSTALL use specified install [$install]" echo " --static enable static build [$static]" echo " --enable-sparse enable sparse checker" echo " --disable-sparse disable sparse checker (default)" +echo " --disable-strip disable stripping binaries" echo " --disable-werror disable compilation abort on warning" echo " --disable-sdl disable SDL" echo " --enable-cocoa enable COCOA (Mac OS X only)" @@ -1258,6 +1262,7 @@ echo "host big endian $bigendian" echo "target list $target_list" echo "gprof enabled $gprof" echo "sparse enabled $sparse" +echo "strip binaries $strip_opt" echo "profiler $profiler" echo "static build $static" echo "-Werror enabled $werror" @@ -1334,7 +1339,6 @@ echo "INSTALL=$install" >> $config_mak echo "CC=$cc" >> $config_mak echo "HOST_CC=$host_cc" >> $config_mak echo "AR=$ar" >> $config_mak -echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak # XXX: only use CFLAGS and LDFLAGS ? # XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross # compilation of dyngen tool (useful for win32 build on Linux host) @@ -1421,6 +1425,9 @@ if test "$sparse" = "yes" ; then echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_mak echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak fi +if test "$strip_opt" = "yes" ; then + echo "STRIP_OPT=-s" >> $config_mak +fi if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> $config_mak echo "#define WORDS_BIGENDIAN 1" >> $config_h -- 2.11.4.GIT