Blame SOURCES/0023-Do-a-better-job-of-making-sure-DLIBEFIVAR_VERSION-ha.patch

4e0e09
From a4212e47ff20b415e042682944a82623b3f75cee Mon Sep 17 00:00:00 2001
4e0e09
From: Peter Jones <pjones@redhat.com>
4e0e09
Date: Wed, 29 May 2019 10:21:32 -0400
4e0e09
Subject: [PATCH 23/63] Do a better job of making sure -DLIBEFIVAR_VERSION
4e0e09
 happens...
4e0e09
4e0e09
Signed-off-by: Peter Jones <pjones@redhat.com>
4e0e09
---
4e0e09
 Make.defaults | 4 +++-
4e0e09
 1 file changed, 3 insertions(+), 1 deletion(-)
4e0e09
4e0e09
diff --git a/Make.defaults b/Make.defaults
4e0e09
index 6c575846687..80fd99eba71 100644
4e0e09
--- a/Make.defaults
4e0e09
+++ b/Make.defaults
4e0e09
@@ -18,7 +18,7 @@ CCLD_FOR_BUILD	?= $(CC_FOR_BUILD)
4e0e09
 CCLD	:= $(if $(filter undefined,$(origin CCLD)),$(CC),$(CCLD))
4e0e09
 OPTIMIZE ?= -O2 -flto
4e0e09
 CFLAGS	?= $(OPTIMIZE) -g3
4e0e09
-CFLAGS	:= $(CFLAGS) -DLIBEFIVAR_VERSION=$(VERSION)
4e0e09
+CFLAGS	:= $(CFLAGS)
4e0e09
 LDFLAGS ?=
4e0e09
 LDFLAGS := $(LDFLAGS)
4e0e09
 AR	:= $(CROSS_COMPILE)$(COMPILER)-ar
4e0e09
@@ -29,6 +29,8 @@ ABIDIFF := abidiff
4e0e09
 
4e0e09
 PKGS	=
4e0e09
 
4e0e09
+CPPFLAGS += -DLIBEFIVAR_VERSION=$(VERSION)
4e0e09
+
4e0e09
 clang_cflags = -D_GNU_SOURCE -std=gnu11 -Wno-address-of-packed-member
4e0e09
 gcc_cflags = -specs=$(TOPDIR)/gcc.specs
4e0e09
 cflags	= $(CFLAGS) -I${TOPDIR}/src/include/ \
4e0e09
-- 
4e0e09
2.26.2
4e0e09