diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2016-03-13 12:57:03 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2016-03-13 12:57:03 +0000 |
| commit | e7b00b072054ae6fc4879d9015543ad302fa01e0 (patch) | |
| tree | e9c299b36ffcc06cc3da2fbcf9b6153fc7915df1 | |
| parent | 451c5ac5fa95d855bd69ff0266acbbfcfcb7fb45 (diff) | |
| download | flashrom-e7b00b072054ae6fc4879d9015543ad302fa01e0.zip flashrom-e7b00b072054ae6fc4879d9015543ad302fa01e0.tar.gz | |
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 <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | util/ich_descriptors_tool/ich_descriptors_tool.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 { |
