Mercurial > mxe-octave

comparison src/of-nan-1-cross-fixes.patch @ 4099:6c7d570cd9ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-nan: update to 3.0.1 * src/of-nan.mk: update version, checksum * src/of-nan-1-cross-fixes.patch: update patch * build_packages.m: update nan version
author John Donoghue
date Mon, 07 Mar 2016 10:23:59 -0500
parents 9f7e9b053041
children be6b10b6faf5
comparison
equal deleted inserted replaced
4098:0727a16b2124 4099:6c7d570cd9ff
1 diff -ur NaN.orig/src/Makefile NaN/src/Makefile 1 diff -ur NaN.orig/src/Makefile NaN/src/Makefile
2 --- NaN.orig/src/Makefile 2015-06-30 13:30:25.348544831 -0400 2 --- NaN.orig/src/Makefile 2016-03-07 08:15:08.086338754 -0500
3 +++ NaN/src/Makefile 2015-06-30 13:35:18.600346663 -0400 3 +++ NaN/src/Makefile 2016-03-07 10:23:34.609405159 -0500
4 @@ -31,13 +31,15 @@ 4 @@ -31,8 +31,9 @@
5 # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; 5 # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
6 #################################################### 6 ####################################################
7 MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) 7 MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
8 -CC = gcc 8 -CC ?= gcc
9 -CXX = g++ 9 -CXX ?= g++
10 +OCTAVE_CONFIG ?= octave-config 10 +OCTAVE_CONFIG ?= octave-config
11 +CC = $(shell $(MKOCTFILE) -p CC) 11 +CC ?= $(shell $(MKOCTFILE) -p CC)
12 +CXX = $(shell $(MKOCTFILE) -p CXX) 12 +CXX ?= $(shell $(MKOCTFILE) -p CXX)
13 CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 13 CFLAGS += -fopenmp -Wall -Wextra -Wconversion -O2
14 OCTMEX = $(MKOCTFILE) --mex 14 OCTMEX = $(MKOCTFILE) --mex -lgomp
15 RM = rm 15 RM = rm
16 @@ -41,8 +42,11 @@
17 # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
18 CFLAGS += $(CPPFLAGS)
16 19
17 -ifneq ($(OS),Windows_NT) 20 -ifneq ($(OS),Windows_NT)
18 +HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)) 21 +HOSTTYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
19 +ifeq (,$(findstring mingw,$(HOST_TYPE))) 22 +ifeq (,$(findstring mingw,$(HOSTTYPE)))
20 CFLAGS += -fPIC 23 CFLAGS += -fPIC
24 +else
25 +OCTMEX = $(MKOCTFILE) --mex
21 endif 26 endif
22 27
28 ifneq (Darwin,$(shell uname))