Mercurial > mxe-octave

diff src/of-nan-1-cross-fixes.patch @ 3980:9f7e9b053041

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-nan: add Nan 2.8.0 package * Makefile.in: add of-nan to OCTAVE_FORGE_PACKAGES * build_packages.m: add nan-2.8.0 install * dist-files.mk: add of-nan-1-cross-fixes.patch, of-nan.m * index.html: add of-nan package * of-nan.mk: new file * of-nan-1-cross-fixes.patch: new file
author John Donoghue
date Tue, 30 Jun 2015 13:41:41 -0400
parents
children 6c7d570cd9ff
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-nan-1-cross-fixes.patch	Tue Jun 30 13:41:41 2015 -0400
@@ -0,0 +1,22 @@
+diff -ur NaN.orig/src/Makefile NaN/src/Makefile
+--- NaN.orig/src/Makefile	2015-06-30 13:30:25.348544831 -0400
++++ NaN/src/Makefile	2015-06-30 13:35:18.600346663 -0400
+@@ -31,13 +31,15 @@
+ # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; 
+ ####################################################
+ MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
+-CC      = gcc
+-CXX     = g++
++OCTAVE_CONFIG ?= octave-config
++CC      = $(shell $(MKOCTFILE) -p CC)
++CXX     = $(shell $(MKOCTFILE) -p CXX)
+ CFLAGS 	= -fopenmp -Wall -Wextra -Wconversion -O2
+ OCTMEX	= $(MKOCTFILE) --mex
+ RM      = rm
+ 
+-ifneq ($(OS),Windows_NT)
++HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
++ifeq (,$(findstring mingw,$(HOST_TYPE)))
+ CFLAGS      += -fPIC
+ endif
+