jsish-freebsd-clang-patch

Index: jsi/Makefile
==================================================================
--- jsi/Makefile
+++ jsi/Makefile
@@ -1,12 +1,12 @@
 # Makefile for jsish: controlled by make.conf from configure.
-INCS=-I.
+INCS=-I. -I/usr/local/include
 WEBSOCKDIR = ../libwebsockets
 SQLITEDIR = ../sqlite3
 ACFILES    = parser.c
 #ACFILES   = jsiParser.c
-CFLAGS += -fno-diagnostics-show-caret -Wsign-compare -Wtype-limits -Wuninitialized
+CFLAGS += -Wsign-compare -Wtype-limits -Wuninitialized
 #CFLAGS += -fsanitize=address
 #ASAN_OPTIONS=abort_on_error=1
 MAKEFILE=Makefile
 CMAKE=cmake

@@ -135,11 +135,11 @@
 PROGLDFLAGS += $(WEBSOCKLIB)

 ifeq ($(JSI__LOAD),1)
 LNKFLAGS += -rdynamic
 COPTS = -fpic
-PROGLDFLAGS += -ldl
+#PROGLDFLAGS += -ldl
 endif

 ifeq ($(JSI__THREADS),1)
 PROGLDFLAGS += -lpthread
 endif
@@ -171,11 +171,11 @@
 PROGLDFLAGS += $(USERLIB)
 OBJS    = $(CFILES:.c=.o) $(EFILES:.c=.o)
 DEFIN  =
 CFLAGS += -g -Wall $(COPTS) $(DEFIN) $(INCS) $(PROGFLAGS) $(OPTS)
 YACC   = bison -v
-LDFLAGS = -lm $(PROGLDFLAGS)
+LDFLAGS = -L/usr/local/lib -lm $(PROGLDFLAGS)
 SHLEXT=.so

 PREFIX=/usr/local
 ZIPDIR=zipdir
 BLDDIR=$(PWD)

Index: jsi/configure
==================================================================
--- jsi/configure
+++ jsi/configure
@@ -1,11 +1,11 @@
 #!/bin/sh

 # The configure.js script uses jsimin so build it.
 if [ ! -x jsimin ]; then
-    make clean
-    make -f Makefile MAKECONF=Configs/make_minimal.conf
-    make clean
+    gmake clean
+    gmake -f Makefile MAKECONF=Configs/make_minimal.conf
+    gmake clean
     echo "Created jsimin"
 fi
 ./jsimin tools/configure.js $*


Index: jsi/jsi.c
==================================================================
--- jsi/jsi.c
+++ jsi/jsi.c
@@ -39,10 +39,12 @@
 #define JSI_INFO(n) NULL
 #endif
 #ifndef JSI_INFO
 #define JSI_INFO(n) n
 #endif
+
+typedef int (*__compar_fn_t) (const void *, const void *);

 /* --ENUMS-- */
 typedef enum {
     /* Jsi Return Codes. */
     JSI_OK=0, JSI_ERROR=1, JSI_RETURN=2, JSI_BREAK=3,

Index: jsi/jsiZvfs.c
==================================================================
--- jsi/jsiZvfs.c
+++ jsi/jsiZvfs.c
@@ -40,10 +40,12 @@
 */
 #define COMPR_BUF_SIZE   8192
 #ifdef __WIN32
 static int maptolower=0;
 #endif
+
+typedef int (*__compar_fn_t) (const void *, const void *);

 typedef enum { ZVFS_SIG_PINFO = 0xbeefbeed, ZVFS_SIG_ARCHIVE, ZVFS_SIG_FILE, ZVFS_SIG_ZFILE } ZVFS_Sig;
 #define ZVFSSIGASSERT(s,n) assert(s->sig == ZVFS_SIG_##n)
 /*
 ** All static variables are collected into a structure named "zvfslocal".