package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch

   1 From ee274ca1ae88bef43da3090d0e1e9155e3b493ad Mon Sep 17 00:00:00 2001
   2 From: Jeremy Kerr <jk@ozlabs.org>
   3 Date: Wed, 19 Mar 2008 17:06:24 +1100
   4 Subject: [PATCH] Use separate CPPFLAGS and LDFLAGS for purgatory
   5
   6 Currently, CPPFLAGS and LDFLAGS can 'leak' into the purgatory build
   7 from the main kexec/kexec object. Because of this, the purgatory
   8 is build with -lz, but we may not have a zlib present for the
   9 architecture of the purgatory object.
  10
  11 This change uses fresh CPPFLAGS and LDFLAGS for the purgatory object.
  12
  13 Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
  14 ---
  15  purgatory/Makefile |    5 +++--
  16  1 files changed, 3 insertions(+), 2 deletions(-)
  17
  18 diff --git a/purgatory/Makefile b/purgatory/Makefile
  19 index 6c747b1..ac58719 100644
  20 --- a/purgatory/Makefile
  21 +++ b/purgatory/Makefile
  22 @@ -49,11 +49,12 @@ $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
  23                       -Os -fno-builtin -ffreestanding \
  24                       -fno-zero-initialized-in-bss
  25
  26 -$(PURGATORY): CPPFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
  27 +$(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
  28                         -I$(srcdir)/purgatory/include \
  29                         -I$(srcdir)/purgatory/arch/$(ARCH)/include \
  30 +                       -I$(srcdir)/util_lib/include \
  31                         -I$(shell $(CC) -print-file-name=include)
  32 -$(PURGATORY): LDFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
  33 +$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
  34                         --no-undefined -nostartfiles -nostdlib -nodefaultlibs \
  35                         -e purgatory_start -r
  36
  37 --
  38 1.5.0.rc4.g85b1
  39