summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-08-17 16:30:53 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-08-17 16:30:53 +0000
commit10572fa08ae7819f06a087e89da6e1611beb7d46 (patch)
tree57b2a38fe31dbecd0d499f68b098b35ab11a69c7
parent4449868623f931dea63b7b552436dd5fc681429e (diff)
downloadast2050-flashrom-10572fa08ae7819f06a087e89da6e1611beb7d46.zip
ast2050-flashrom-10572fa08ae7819f06a087e89da6e1611beb7d46.tar.gz
Fix compilation on Nexenta which is Ubuntu with a Solaris kernel
Corresponding to flashrom svn r686. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Reinauer <stepan@coresystems.de>
-rw-r--r--Makefile3
-rw-r--r--README11
2 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0141bef..f8400b0 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ CONFIG_SERPROG = yes
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'")
diff --git a/README b/README
index 9f21c21..070acff 100644
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ Linux et al:
* 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 @@ To compile on FreeBSD, use:
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:
OpenPOWER on IntegriCloud