Make nixio compile on OpenSolaris

[project/luci.git] / libs / nixio / Makefile

diff --git a/libs/nixio/Makefile b/libs/nixio/Makefile
index df63dc1..f8d01b7 100644 (file)
--- a/libs/nixio/Makefile
+++ b/libs/nixio/Makefile
@@ -6,8 +6,6 @@ AXTLS_VERSION = 1.2.1
 AXTLS_DIR     = axTLS
 AXTLS_FILE    = $(AXTLS_DIR)-$(AXTLS_VERSION).tar.gz
 NIXIO_TLS    ?= axtls
-EXTRA_CFLAGS  = -std=c99
-NIXIO_CFLAGS  = -D_XOPEN_SOURCE=500
 
 NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
            src/poll.o src/io.o src/file.o src/splice.o src/process.o \
@@ -24,10 +22,6 @@ ifeq ($(NIXIO_TLS),openssl)
        TLS_LDFLAGS = -lssl
 endif
 
-ifeq ($(OS),Linux)
-       NIXIO_CFLAGS = -D_GNU_SOURCE
-endif
-
 %.o: %.c
        $(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
 
@@ -55,7 +49,7 @@ $(AXTLS_DIR)/.prepared:
        touch $@
 
 src/libaxtls.a: $(AXTLS_DIR)/.prepared
-       $(MAKE) -C $(AXTLS_DIR) CC=$(CC) CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS) $(FPIC) '-Dalloca(size)=__builtin_alloca(size)' -Wall -pedantic -I../config -I../ssl -I../crypto" LDFLAGS="$(LDFLAGS)" OS="$(OS)" clean all
+       $(MAKE) -C $(AXTLS_DIR) CC=$(CC) CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS) $(FPIC) -Wall -pedantic -I../config -I../ssl -I../crypto" LDFLAGS="$(LDFLAGS)" OS="$(OS)" clean all
        cp -p $(AXTLS_DIR)/_stage/libaxtls.a src
 
 clean: luaclean