Mercurial > mxe-octave

annotate src/of-nan-1-cross-fixes.patch @ 4182:be6b10b6faf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author John D
date Fri, 05 Aug 2016 21:24:57 -0400
parents 6c7d570cd9ff
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4182
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
1 diff -ur nan-3.0.2.orig/src/Makefile nan-3.0.2/src/Makefile
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
2 --- nan-3.0.2.orig/src/Makefile 2016-08-03 10:30:35.433478948 -0400
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
3 +++ nan-3.0.2/src/Makefile 2016-08-03 10:42:48.629174523 -0400
4099
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
4 @@ -31,8 +31,9 @@
3980
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
5 # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
6 ####################################################
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
7 MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
4099
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
8 -CC ?= gcc
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
9 -CXX ?= g++
3980
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
10 +OCTAVE_CONFIG ?= octave-config
4099
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
11 +CC ?= $(shell $(MKOCTFILE) -p CC)
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
12 +CXX ?= $(shell $(MKOCTFILE) -p CXX)
4182
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
13 CFLAGS += -Wall -Wextra -Wconversion -O2
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
14 OCTMEX = $(MKOCTFILE) --mex
3980
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
15 RM = rm
4182
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
16 @@ -41,9 +42,10 @@
4099
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
17 # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
18 CFLAGS += $(CPPFLAGS)
3980
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
19
4182
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
20 -ifeq ($(OS),Windows_NT)
4099
6c7d570cd9ff of-nan: update to 3.0.1
John Donoghue
parents: 3980
diff changeset
21 +HOSTTYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
4182
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
22 +ifneq (,$(findstring mingw,$(HOSTTYPE)))
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
23 # CC need to be defined on Windows, see also http://savannah.gnu.org/bugs/?47559
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
24 - CC = gcc
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
25 + CC = $(shell $(MKOCTFILE) -p CC)
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
26 else ifeq (Darwin,$(shell uname))
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
27 # no OpenMP on MacOSX, neither for Matlab nor Octave
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
28 else
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
29 @@ -93,14 +95,14 @@
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
30 # Octave, MATLAB on Linux
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
31 #########################################################
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
32 svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
33 - env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
34 + env CC="$(CXX)" $(OCTMEX) "$<" svm.o svm_model_octave.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
35 svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
36 $(MATMEX) "$<" svm.o svm_model_matlab.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
37 %.$(MEX_EXT): %.cpp
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
38 $(MATMEX) "$<"
3980
9f7e9b053041 of-nan: add Nan 2.8.0 package
John Donoghue
parents:
diff changeset
39
4182
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
40 svm_model_octave.o: svm_model_matlab.c
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
41 - env CC=$(CC) $(MKOCTFILE) -o "$@" -c "$<"
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
42 + env CC="$(CC)" $(MKOCTFILE) -o "$@" -c "$<"
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
43 svm_model_matlab.o: svm_model_matlab.c
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
44 $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
45 svm.o: svm.cpp
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
46 @@ -111,7 +113,7 @@
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
47 $(MATMEX) -lblas train.c tron.o linear.o linear_model_matlab.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
48 #$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
49 train.mex predict.mex: train.c tron.o linear.o linear_model_matlab.c
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
50 - env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
51 + env CC="$(CXX)" $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
52 linear.o: linear.cpp
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
53 $(CXX) $(CFLAGS) -c linear.cpp
be6b10b6faf5 of-nan: update to 3.0.2
John D
parents: 4099
diff changeset
54 tron.o: tron.cpp tron.h