# HG changeset patch
# User John D
# Date 1470446697 14400
# Node ID be6b10b6faf509b94796bd2e9192f2c9bed4593a
# Parent  3fc30cd416ac9c6ec2c5e809e4f1ca646a2e70ed
of-nan: update to 3.0.2

* of-nan-1-cross-fixes.patch: update cross patch

* of-nan.mk: update version, checksum, subdir

* build_packages.m: update nan version

diff -r 3fc30cd416ac -r be6b10b6faf5 build_packages.m
--- a/build_packages.m	Tue Aug 02 15:21:03 2016 -0400
+++ b/build_packages.m	Fri Aug 05 21:24:57 2016 -0400
@@ -66,7 +66,7 @@
   try_install strings-1.2.0.tar.gz
   try_install ga-0.10.0.tar.gz
   try_install interval-1.5.0.tar.gz
-  try_install nan-3.0.1.tar.gz
+  try_install nan-3.0.2.tar.gz
   try_install ocs-0.1.5.tar.gz
   try_install mapping-1.2.1.tar.gz
   try_install tisean-0.2.3.tar.gz
diff -r 3fc30cd416ac -r be6b10b6faf5 src/of-nan-1-cross-fixes.patch
--- a/src/of-nan-1-cross-fixes.patch	Tue Aug 02 15:21:03 2016 -0400
+++ b/src/of-nan-1-cross-fixes.patch	Fri Aug 05 21:24:57 2016 -0400
@@ -1,6 +1,6 @@
-diff -ur NaN.orig/src/Makefile NaN/src/Makefile
---- NaN.orig/src/Makefile	2016-03-07 08:15:08.086338754 -0500
-+++ NaN/src/Makefile	2016-03-07 10:23:34.609405159 -0500
+diff -ur nan-3.0.2.orig/src/Makefile nan-3.0.2/src/Makefile
+--- nan-3.0.2.orig/src/Makefile	2016-08-03 10:30:35.433478948 -0400
++++ nan-3.0.2/src/Makefile	2016-08-03 10:42:48.629174523 -0400
 @@ -31,8 +31,9 @@
  # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; 
  ####################################################
@@ -10,19 +10,45 @@
 +OCTAVE_CONFIG ?= octave-config
 +CC      ?= $(shell $(MKOCTFILE) -p CC)
 +CXX     ?= $(shell $(MKOCTFILE) -p CXX)
- CFLAGS += -fopenmp -Wall -Wextra -Wconversion -O2
- OCTMEX	= $(MKOCTFILE) --mex -lgomp
+ CFLAGS += -Wall -Wextra -Wconversion -O2
+ OCTMEX	= $(MKOCTFILE) --mex
  RM      = rm
-@@ -41,8 +42,11 @@
+@@ -41,9 +42,10 @@
  # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
  CFLAGS += $(CPPFLAGS)
  
--ifneq ($(OS),Windows_NT)
+-ifeq ($(OS),Windows_NT)
 +HOSTTYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
-+ifeq (,$(findstring mingw,$(HOSTTYPE)))
- CFLAGS      += -fPIC
-+else
-+OCTMEX	= $(MKOCTFILE) --mex
- endif
++ifneq (,$(findstring mingw,$(HOSTTYPE)))
+   # CC need to be defined on Windows, see also http://savannah.gnu.org/bugs/?47559
+-  CC = gcc
++  CC = $(shell $(MKOCTFILE) -p CC)
+ else ifeq (Darwin,$(shell uname))
+   # no OpenMP on MacOSX, neither for Matlab nor Octave
+ else
+@@ -93,14 +95,14 @@
+ #	Octave, MATLAB on Linux 
+ #########################################################
+ svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
+-	env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
++	env CC="$(CXX)" $(OCTMEX) "$<" svm.o svm_model_octave.o
+ svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
+ 	$(MATMEX) "$<" svm.o svm_model_matlab.o
+ %.$(MEX_EXT): %.cpp
+ 	$(MATMEX) "$<"
  
- ifneq (Darwin,$(shell uname)) 
+ svm_model_octave.o: svm_model_matlab.c 
+-	env CC=$(CC) $(MKOCTFILE) -o "$@" -c "$<"
++	env CC="$(CC)" $(MKOCTFILE) -o "$@" -c "$<"
+ svm_model_matlab.o: svm_model_matlab.c 
+ 	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"  
+ svm.o: svm.cpp
+@@ -111,7 +113,7 @@
+ 	$(MATMEX)  -lblas train.c tron.o linear.o linear_model_matlab.o 
+ 	#$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
+ train.mex predict.mex: train.c tron.o linear.o linear_model_matlab.c
+-	env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
++	env CC="$(CXX)" $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
+ linear.o: linear.cpp
+ 	$(CXX) $(CFLAGS) -c linear.cpp
+ tron.o: tron.cpp tron.h
diff -r 3fc30cd416ac -r be6b10b6faf5 src/of-nan.mk
--- a/src/of-nan.mk	Tue Aug 02 15:21:03 2016 -0400
+++ b/src/of-nan.mk	Fri Aug 05 21:24:57 2016 -0400
@@ -3,10 +3,10 @@
 
 PKG             := of-nan
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.1
-$(PKG)_CHECKSUM := 4fbd03c64374781765c27c1aad4ddbf86bd36b5b
+$(PKG)_VERSION  := 3.0.2
+$(PKG)_CHECKSUM := cb9d51a9b97cd906a86282c8f1ec91bf314de414
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := NaN
+$(PKG)_SUBDIR   := nan-$($(PKG)_VERSION)
 $(PKG)_FILE     := nan-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     :=