MacOSX build fixes.

Author: basil00

Makefile.macosx

@@ -1,14 +1,17 @@
 CC = clang
 STRIP = strip
-OBJS = pseudo_node.o sha256.o
-CFLAGS = -std=gnu99 -DMACOSX -O2 -Wall -Wno-unused-value
-CLIBS = -lpthread
+OBJS = pseudo_node.o
+CFLAGS = -std=gnu99 -DMACOSX -O2 -Wall -Wno-unused-value -fpic
+CLIBS = -lpthread -ldl -Wl,-rpath -Wl,.
 
-pseudonode: $(OBJS)
-	$(CC) $(CFLAGS) -o pseudonode $(OBJS) $(CLIBS)
+pseudonode: libpseudonode.dylib main.o
+	$(CC) $(CFLAGS) -o pseudonode main.o $(CLIBS) -L. libpseudonode.dylib
 	$(STRIP) pseudonode
 	cp pseudonode pseudonode.macosx
 
+libpseudonode.dylib: $(OBJS)
+	$(CC) -shared -o libpseudonode.dylib $(OBJS)
+
 clean:
-	rm -f $(OBJS) pseduonode
+	rm -f $(OBJS) main.o
 

apps/txmon/Makefile.macosx

@@ -2,7 +2,7 @@ CC = clang
 STRIP = strip
 OBJS = txmon.o
 CFLAGS = -std=gnu99 -DLINUX -I../../ -O2 -Wall -Wno-unused-value -fpic
-CLIBS = -L ../../ -lpseudonode -lpthread -ldl -Wl,-R.
+CLIBS = -L ../../ -lpseudonode -lpthread -ldl -Wl,-rpath -Wl,. 
 
 txmon: txmon.o
 	$(CC) $(CFLAGS) -o txmon $(OBJS) $(CLIBS)

apps/txmon/txmon.c

@@ -898,6 +898,10 @@ int main(int argc, char **argv)
     if (!isatty(1))
         option_color = false;
 
+#ifdef LINUX
+    signal(SIGPIPE, SIG_IGN);
+#endif
+
     struct PN_callbacks CALLBACKS;
     memset(&CALLBACKS, 0, sizeof(CALLBACKS));
     CALLBACKS.tx    = tx_callback;

main.c

@@ -39,9 +39,18 @@
 #include <setjmp.h>
 #include <getopt.h>
 
+#ifdef MACOSX
+#define LINUX
+#endif
+
 #ifdef LINUX
 #include <pwd.h>
 #include <arpa/inet.h>
+
+#ifdef MACOSX
+#define s6_addr16       __u6_addr.__u6_addr16
+#endif
+
 #endif      /* LINUX */
 
 #ifdef WINDOWS
@@ -234,6 +243,10 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
+#ifdef LINUX
+        signal(SIGPIPE, SIG_IGN);
+#endif
+
     struct PN_config CONFIG;
     memset(&CONFIG, 0, sizeof(CONFIG));
     CONFIG.user_agent = USER_AGENT;