[PATCH] Fix compilation on Nexenta (Ubuntu/Solaris)

[Carl-Daniel Hailfinger]

Fix compilation on Nexenta which is Ubuntu with a Solaris kernel.

This is 0.9.1 material.

Signed-off-by: Carl-Daniel Hailfinger

Index: flashrom-nexenta/Makefile
===================================================================
--- flashrom-nexenta/Makefile	(Revision 684)
+++ flashrom-nexenta/Makefile	(Arbeitskopie)
@@ -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'")

Index: flashrom-nexenta/README
===================================================================
--- flashrom-nexenta/README	(Revision 684)
+++ flashrom-nexenta/README	(Arbeitskopie)
@@ -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:

[Stefan Reinauer]

On 8/17/09 5:59 PM, Carl-Daniel Hailfinger wrote:
> Fix compilation on Nexenta which is Ubuntu with a Solaris kernel.
>
> This is 0.9.1 material.
>
> Signed-off-by: Carl-Daniel Hailfinger
> Index: flashrom-nexenta/Makefile
>
> --- flashrom-nexenta/Makefile	(Revision 684)
> +++ flashrom-nexenta/Makefile	(Arbeitskopie)
> @@ -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

A site note... is it possible to use "$(OS)" instead of "$(OS_ARCH)" on
SunOS? $(OS) is set by (GNU?) make

Acked-by: Stefan Reinauer

[Carl-Daniel Hailfinger]

On 17.08.2009 18:16, Stefan Reinauer wrote:
> On 8/17/09 5:59 PM, Carl-Daniel Hailfinger wrote:
> > Fix compilation on Nexenta which is Ubuntu with a Solaris kernel.
>
> A site note... is it possible to use "$(OS)" instead of "$(OS_ARCH)" on
> SunOS? $(OS) is set by (GNU?) make

$(OS) is empty on Linux and Nexenta and FreeBSD.
> Acked-by: Stefan Reinauer

Thanks, committed in r686.

Regards,
Carl-Daniel