Mercurial > mxe-octave
changeset 3941:1368ac3ea124
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 | 4255bbc26c5e |
children | f9273cae479a |
files | build_packages.m dist-files.mk src/of-tsa-1-cross-fixes.patch src/of-tsa.mk |
diffstat | 4 files changed, 33 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/build_packages.m Sun May 17 15:58:29 2015 -0400 +++ b/build_packages.m Sun May 17 21:02:38 2015 -0400 @@ -41,7 +41,7 @@ try_install quaternion-2.4.0.tar.gz try_install fits-1.0.5.tar.gz try_install fl-core-1.0.0.tar.gz -try_install tsa-4.2.7.tar.gz +try_install tsa-4.2.9.tar.gz try_install dicom-0.1.1.tar.gz try_install netcdf-1.0.6.tar.gz try_install ltfat-2.1.0.tar.gz
--- a/dist-files.mk Sun May 17 15:58:29 2015 -0400 +++ b/dist-files.mk Sun May 17 21:02:38 2015 -0400 @@ -493,6 +493,7 @@ of-strings-1-fixes.patch \ of-strings.mk \ of-struct.mk \ + of-tsa-1-cross-fixes.patch \ of-tsa.mk \ of-windows-1-fixes.patch \ of-windows.mk \
--- /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
--- a/src/of-tsa.mk Sun May 17 15:58:29 2015 -0400 +++ b/src/of-tsa.mk Sun May 17 21:02:38 2015 -0400 @@ -3,8 +3,8 @@ PKG := of-tsa $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.7 -$(PKG)_CHECKSUM := 80d2faa61c32043bf1edc2c0fa48fe0c00eacd89 +$(PKG)_VERSION := 4.2.9 +$(PKG)_CHECKSUM := b0d0ca2f8dfd683e17c8380414d323930210ac6b $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := tsa $(PKG)_FILE := tsa-$($(PKG)_VERSION).tar.gz