http://git.et.redhat.com/?p=qemu-fedora.git Update the current patches with ones produced using format-patch, no real changes here. Drop a couple of patches which aren't referenced in the spec file
94 lines
3.2 KiB
Diff
94 lines
3.2 KiB
Diff
From 7fe411e73b6e6c7f8cc3eb9c3202b7c575a7670c Mon Sep 17 00:00:00 2001
|
|
From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
|
|
Date: Sun, 5 Apr 2009 17:41:02 +0000
|
|
Subject: [PATCH 10/18] 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 <riku.voipio@iki.fi>
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
|
---
|
|
Makefile | 2 +-
|
|
configure | 9 ++++++++-
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 2af4c06..1162f35 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 e00893f..2fed692 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
|
|
--
|
|
1.6.2.2
|
|
|