Mercurial > mxe-octave

diff src/of-tsa-1-cross-fixes.patch @ 3941:1368ac3ea124

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-tsa: update to v4.2.9 * src/of-tsa.mk: update version, checksum * src/of-tsa-1-cross-fixes.patch: new file * dist-files.mk: add of-tsa-1-cross-fixes.patch * build_packages.m: update tsa version
author John Donoghue <john.donoghue@ieee.org>
date Sun, 17 May 2015 21:02:38 -0400
parents
children c970bbc5e7db
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-tsa-1-cross-fixes.patch	Sun May 17 21:02:38 2015 -0400
@@ -0,0 +1,29 @@
+diff -ur tsa.orig/src/Makefile tsa/src/Makefile
+--- tsa.orig/src/Makefile	2015-05-17 20:55:08.000000000 -0400
++++ tsa/src/Makefile	2015-05-17 20:58:48.000000000 -0400
+@@ -39,11 +39,12 @@
+ W32_LIBS += $(LDLIBS_W32)libblas.a
+ W64_LIBS += $(LDLIBS_W64)libblas.a
+ 
+-CC  	= gcc
+-CXX 	= g++
++CC  	?= gcc
++CXX 	?= g++
+ CFLAGS 	= -Wall -Wextra -Wconversion -O2 -fPIC 
+-OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
+-RM      = rm
++MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
++OCTMEX	?= $(MKOCTFILE) --mex
++RM      ?= rm
+ 
+ ifneq (Darwin,$(shell uname))
+ CFLAGS      += -fopenmp
+@@ -91,7 +92,7 @@
+ #	Octave, MATLAB on Linux 
+ #########################################################
+ %.oct: %.cc
+-	mkoctfile$(OCTAVE_VERSION) "$<"
++	$(MKOCTFILE) "$<"
+ 
+ %.mex: %.cpp
+ 	$(OCTMEX) "$<" -llapack -lblas