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

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