[flashrom] [commit] r686 - trunk

[svn at flashrom.org]

Author: hailfinger
Date: 2009-08-17 18:30:53 +0200 (Mon, 17 Aug 2009)
New Revision: 686

Modified:
   trunk/Makefile
   trunk/README
Log:
Fix compilation on Nexenta which is Ubuntu with a Solaris kernel.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Stefan Reinauer <stepan at coresystems.de>


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-08-13 23:23:37 UTC (rev 685)
+++ trunk/Makefile	2009-08-17 16:30:53 UTC (rev 686)
@@ -70,7 +70,10 @@
 ifeq ($(CONFIG_SERPROG), yes)
 FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1'
 OBJS += serprog.o
+ifeq ($(OS_ARCH), SunOS)
+LIBS += -lsocket
 endif
+endif
 
 FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'")
 

Modified: trunk/README
===================================================================
--- trunk/README	2009-08-13 23:23:37 UTC (rev 685)
+++ trunk/README	2009-08-17 16:30:53 UTC (rev 686)
@@ -43,7 +43,7 @@
 
  * pciutils
  * pciutils-devel / pciutils-dev / libpci-dev
- * zlib-devel / zlib1g-dev
+ * zlib-devel / zlib1g-dev (only needed if libpci is static)
 
 On FreeBSD, you need the following ports:
 
@@ -58,15 +58,18 @@
 
  gmake
 
+To compile on Nexenta, use:
+
+ make
+
 To compile on Solaris, use:
 
- gmake LDFLAGS="-L$pathtolibpci -lpci -lz" CC="gcc -I$pathtopciheaders" \
-       CFLAGS=-O2
+ gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2
 
 To compile on DragonFly BSD, use:
 
  ln -s /usr/pkg/include/pciutils pci
- gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -lpci -lz"
+ gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib"
 
 To compile and run on Darwin/Mac OS X: