Hi,
the following patch can be applied both to filo-0.6b and libpayload, and
is one of several changes to make things build on solaris.
The changes:
1.
Preset CC to gcc in Makefile. There are some $(shell $(CC) ...)
invocations with GCC specific options, so that shouldn't hurt.
2.
Replace stdbool.h include in util/kconfig/expr.h by a custom
implementation of booleans. This is okay as these booleans are purely
internal. It's necessary because there's some disagreement between the
Solaris headers and GCC on Solaris, about when stdbool.h is appropriate.
3.
Remove stdbool.h include from util/kconfig/zconf.tab.c_shipped. This
file includes expr.h already, so it picks up the right set of
primitives, without duplicating the special case for Solaris.
Comments?
Patrick Georgi
Signed-off-by: Patrick Georgi <[EMAIL PROTECTED]>
Index: Makefile
===================================================================
--- Makefile (revision 687)
+++ Makefile (working copy)
@@ -41,6 +41,7 @@
Q := @
endif
+CC = gcc
HOSTCC = gcc
HOSTCXX = g++
HOSTCFLAGS := -I$(srck) -I$(objk)
Index: util/kconfig/zconf.tab.c_shipped
===================================================================
--- util/kconfig/zconf.tab.c_shipped (revision 687)
+++ util/kconfig/zconf.tab.c_shipped (working copy)
@@ -158,7 +158,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
#define LKC_DIRECT_LINK
#include "lkc.h"
Index: util/kconfig/expr.h
===================================================================
--- util/kconfig/expr.h (revision 687)
+++ util/kconfig/expr.h (working copy)
@@ -12,8 +12,13 @@
#include <stdio.h>
#ifndef __cplusplus
+#ifndef __sun
#include <stdbool.h>
+#else
+typedef short bool;
+enum { true=1, false=0};
#endif
+#endif
struct file {
struct file *next;
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
