Mercurial > mxe-octave

annotate src/of-tsa-1-cross-fixes.patch @ 4037:85abb6c3ec8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-netcdf: patch for --enable-64 (Bug #46060) * src/of-netcdf-1-fixes.patch: new file * dist-files.mk: add of-netcdf-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 29 Sep 2015 19:43:19 -0400
parents c970bbc5e7db
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3941
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -ur tsa.orig/src/Makefile tsa/src/Makefile
4030
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
2 --- tsa.orig/src/Makefile 2015-09-16 09:30:29.103875849 -0400
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
3 +++ tsa/src/Makefile 2015-09-16 09:40:42.945344571 -0400
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
4 @@ -41,9 +41,16 @@
3941
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5
4030
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
6 CC ?= gcc
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
7 CXX ?= g++
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
8 -CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
9 -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
3941
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 -RM = rm
4030
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
11 +CFLAGS ?= -Wall -Wextra -Wconversion -O2 -fPIC
3941
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 +MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
4030
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
13 +OCTAVE_CONFIG ?= octave-config
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
14 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
15 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
16 + OCTMEX ?= $(MKOCTFILE) --mex
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
17 +else
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
18 + OCTMEX ?= $(MKOCTFILE) --mex -lgomp
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
19 +endif
3941
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 +RM ?= rm
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 ifneq (Darwin,$(shell uname))
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 CFLAGS += -fopenmp
4030
c970bbc5e7db tsa: update to v4.3.2
John Donoghue
parents: 3941
diff changeset
24 @@ -89,7 +96,7 @@
3941
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 # Octave, MATLAB on Linux
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 #########################################################
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 %.oct: %.cc
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 - mkoctfile$(OCTAVE_VERSION) "$<"
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 + $(MKOCTFILE) "$<"
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 %.mex: %.cpp
1368ac3ea124 of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 $(OCTMEX) "$<" -llapack -lblas