cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
Blob Blame History Raw
From 9997a461dc882720fff3990aeca0725a91f20ac3 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Wed, 12 Sep 2018 09:43:39 +0100
Subject: [PATCH 2/4] Fix annocheck issues

RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
Message-id: <1536745419-16795-1-git-send-email-mrezanin@redhat.com>
Patchwork-id: 82139
O-Subject: [RHEL8/rhel qemu-kvm PATCH] Fix annocheck issues
Bugzilla: 1624164
RH-Acked-by: Thomas Huth <thuth@redhat.com>
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

From: Miroslav Rezanina <mrezanin@redhat.com>

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1624164
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=18283300
BRANCH: rhel8/master-2.12.0
Upstream: Do we want have this upstream?

annocheck reports several issues with qemu-kvm packages.

Most of them is "Compiled without -D_GLIBCXX_ASSERTIONS.". These issues
comes from capstone submodule as we strip all -W compile flags. We can
add missing flag downstream but I'm not sure this change should be done
upstream too.

In addition, there's "Not linked with -Wl,-z,now." error for s390-ccw.img
and s390-netboot.img. However, this flag is used for building these files
as build log shows.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 9803f27..da3eedb 100644
--- a/Makefile
+++ b/Makefile
@@ -502,6 +502,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
 CAP_CFLAGS += -DCAPSTONE_HAS_ARM64
 CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC
 CAP_CFLAGS += -DCAPSTONE_HAS_X86
+CAP_CFLAGS += -Wp,-D_GLIBCXX_ASSERTIONS
 
 subdir-capstone: .git-submodule-status
 	$(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_DIR)/capstone/$(LIBCAPSTONE))
-- 
1.8.3.1