From fc3ecc2a812235fce1a4cdc7dc3338507150e8c7 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Sun, 13 Mar 2016 12:57:03 +0000 Subject: Fix compilation on SunOS This came up when I was testing if building on SunOS still works on the buildbot's instance of OmniOS r151014 which is based on illumos. The fix is - to link against libnsl - a small C type fix in ich_descriptor_tool Corresponding to flashrom svn r1950. Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- Makefile | 2 +- util/ich_descriptors_tool/ich_descriptors_tool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 927105d..f94ec7b 100644 --- a/Makefile +++ b/Makefile @@ -926,7 +926,7 @@ endif ifneq ($(NEED_POSIX_SOCKETS), ) ifeq ($(TARGET_OS), SunOS) -LIBS += -lsocket +LIBS += -lsocket -lnsl endif endif diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c index c3d9ba1..ad3b6f0 100644 --- a/util/ich_descriptors_tool/ich_descriptors_tool.c +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) usage(argv, "Seeking to the end of the file failed"); #ifdef HAVE_MMAP - buf = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0); + buf = (uint32_t *)mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0); if (buf == (void *) -1) #endif { -- cgit v1.1