Mercurial > mxe-octave

comparison src/of-tsa-1-cross-fixes.patch @ 4030:c970bbc5e7db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tsa: update to v4.3.2 * src/of-tsa.mk: update version, checksum * src/of-tsa-1-cross-fixes.patch: update patch file * build_packages.m: update tsa version
author John Donoghue
date Wed, 16 Sep 2015 11:53:50 -0400
parents 1368ac3ea124
children
comparison
equal deleted inserted replaced
4029:c4a341e3e014 4030:c970bbc5e7db
1 diff -ur tsa.orig/src/Makefile tsa/src/Makefile 1 diff -ur tsa.orig/src/Makefile tsa/src/Makefile
2 --- tsa.orig/src/Makefile 2015-05-17 20:55:08.000000000 -0400 2 --- tsa.orig/src/Makefile 2015-09-16 09:30:29.103875849 -0400
3 +++ tsa/src/Makefile 2015-05-17 20:58:48.000000000 -0400 3 +++ tsa/src/Makefile 2015-09-16 09:40:42.945344571 -0400
4 @@ -39,11 +39,12 @@ 4 @@ -41,9 +41,16 @@
5 W32_LIBS += $(LDLIBS_W32)libblas.a
6 W64_LIBS += $(LDLIBS_W64)libblas.a
7 5
8 -CC = gcc 6 CC ?= gcc
9 -CXX = g++ 7 CXX ?= g++
10 +CC ?= gcc 8 -CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC
11 +CXX ?= g++ 9 -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
12 CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC
13 -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
14 -RM = rm 10 -RM = rm
11 +CFLAGS ?= -Wall -Wextra -Wconversion -O2 -fPIC
15 +MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) 12 +MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
16 +OCTMEX ?= $(MKOCTFILE) --mex 13 +OCTAVE_CONFIG ?= octave-config
14 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
15 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
16 + OCTMEX ?= $(MKOCTFILE) --mex
17 +else
18 + OCTMEX ?= $(MKOCTFILE) --mex -lgomp
19 +endif
17 +RM ?= rm 20 +RM ?= rm
18 21
19 ifneq (Darwin,$(shell uname)) 22 ifneq (Darwin,$(shell uname))
20 CFLAGS += -fopenmp 23 CFLAGS += -fopenmp
21 @@ -91,7 +92,7 @@ 24 @@ -89,7 +96,7 @@
22 # Octave, MATLAB on Linux 25 # Octave, MATLAB on Linux
23 ######################################################### 26 #########################################################
24 %.oct: %.cc 27 %.oct: %.cc
25 - mkoctfile$(OCTAVE_VERSION) "$<" 28 - mkoctfile$(OCTAVE_VERSION) "$<"
26 + $(MKOCTFILE) "$<" 29 + $(MKOCTFILE) "$<"