File xen.SEABIOS_CPP.patch of Package xen
From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 11 Mar 2021 10:30:25 +0100
Subject: SEABIOS_CPP
seabios needs the real cpp, while qemu and others need cc -E due to -c.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
tools/firmware/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -1,19 +1,20 @@
XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
# hvmloader is a 32-bit protected mode binary.
TARGET := hvmloader/hvmloader
INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
+SEABIOS_CPP ?= cpp
SUBDIRS-y :=
ifeq ($(OVMF_PATH),)
SUBDIRS-$(CONFIG_OVMF) += ovmf-dir
endif
ifeq ($(SEABIOS_PATH),)
SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
endif
SUBDIRS-$(CONFIG_ROMBIOS) += rombios
SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
SUBDIRS-y += hvmloader
@@ -29,25 +30,25 @@ seabios-dir:
.PHONY: all
all: $(SUBDIRS-y)
ifeq ($(CONFIG_ROMBIOS),y)
@set -e; if [ $$((`( bcc -v 2>&1 | grep version || echo 0.0.0 ) | cut -d' ' -f 3 | awk -F. '{ printf "0x%02x%02x%02x", $$1, $$2, $$3}'`)) -lt $$((0x00100e)) ] ; then \
echo "==========================================================================="; \
echo "Require dev86 rpm or bin86 & bcc debs version >= 0.16.14 to build firmware!"; \
echo "(visit http://www.debath.co.uk/dev86/ for more information)"; \
echo "==========================================================================="; \
false ; \
fi
endif
- $(MAKE) $(LD32BIT-y) CC=$(CC) PYTHON=$(PYTHON) VERSION="$(SEABIOS_UPSTREAM_REVISION)" subdirs-$@
+ $(MAKE) $(LD32BIT-y) CC=$(CC) CPP=$(SEABIOS_CPP) PYTHON=$(PYTHON) VERSION="$(SEABIOS_UPSTREAM_REVISION)" subdirs-$@
.PHONY: install
install: all
[ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
[ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
.PHONY: clean
clean: subdirs-clean
.PHONY: distclean
distclean: subdirs-distclean