Mercurial > mxe-octave
changeset 4015:f3d167e40f01
of-tisean: add new package
* Makefile.in: add tisean package
* build_packages.m: add tisean package to installer
* dist-files.mk: update for of-tisean-1-fortran.patch, of-tisean.mk
* src/of-tisean-1-fortran.patch: new file
* src/of-tisean.mk: new file
| author | John Donoghue |
|---|---|
| date | Tue, 25 Aug 2015 08:40:44 -0400 |
| parents | 9eca3f114683 |
| children | 57fdbbe97ab5 |
| files | Makefile.in build_packages.m dist-files.mk index.html src/of-tisean-1-fixes.patch src/of-tisean.mk |
| diffstat | 6 files changed, 71 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Aug 24 12:45:49 2015 -0400 +++ b/Makefile.in Tue Aug 25 08:40:44 2015 -0400 @@ -429,7 +429,7 @@ endif OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' -OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows linear-algebra sockets zenity data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat database instrument-control generate_html nurbs strings octcdf financial stk splines dataframe lssa queueing ga odepkg interval nan ocs mapping) +OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows linear-algebra sockets zenity data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat database instrument-control generate_html nurbs strings octcdf financial stk splines dataframe lssa queueing ga odepkg interval nan ocs mapping tisean) # get ALL deps for all of- packages, regardless of whethe building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(wildcard $(TOP_DIR)/src/of-*.mk),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
--- a/build_packages.m Mon Aug 24 12:45:49 2015 -0400 +++ b/build_packages.m Tue Aug 25 08:40:44 2015 -0400 @@ -63,4 +63,5 @@ try_install nan-2.8.1.tar.gz try_install ocs-0.1.5.tar.gz try_install mapping-1.2.0.tar.gz +try_install tisean-0.2.3.tar.gz
--- a/dist-files.mk Mon Aug 24 12:45:49 2015 -0400 +++ b/dist-files.mk Tue Aug 25 08:40:44 2015 -0400 @@ -502,6 +502,8 @@ of-strings-1-fixes.patch \ of-strings.mk \ of-struct.mk \ + of-tisean-1-fortran.patch \ + of-tisean.mk \ of-tsa-1-cross-fixes.patch \ of-tsa.mk \ of-windows-1-fixes.patch \
--- a/index.html Mon Aug 24 12:45:49 2015 -0400 +++ b/index.html Tue Aug 25 08:40:44 2015 -0400 @@ -2010,6 +2010,10 @@ <td class="website"><a href="http://octave.sf.net/">Octave Forge struct package</a></td> </tr> <tr> + <td class="package">of-tisean</td> + <td class="website"><a href="http://octave.sf.net/">Octave Forge tisean package</a></td> + </tr> + <tr> <td class="package">of-tsa</td> <td class="website"><a href="http://octave.sf.net/">Octave Forge tsa package</a></td> </tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-tisean-1-fixes.patch Tue Aug 25 08:40:44 2015 -0400 @@ -0,0 +1,38 @@ +# HG changeset patch +# User John Donoghue +# Date 1440511254 14400 +# Tue Aug 25 10:00:54 2015 -0400 +# Node ID 6ccac6d363c9082ab3898e7220ca1b3e3bb09043 +# Parent 1bbc3eb050ac4fcb6704e43ef11dc809c0a83e55 +Use FLIB settings from mkoctfile in mingw build + +* src/Makefile.in: set F77LIBS to mkoctfile values and use in link + +diff -r 1bbc3eb050ac -r 6ccac6d363c9 src/Makefile.in +--- a/src/Makefile.in Fri Aug 14 16:28:35 2015 -0600 ++++ b/src/Makefile.in Tue Aug 25 10:00:54 2015 -0400 +@@ -1,9 +1,15 @@ + MKOCTFILE ?= mkoctfile -Wall ++OCTAVE_CONFIG ?= octave-config + SED ?= sed + LIBS_F=source_f/libsla.a + CXXFLAGS=@CXXFLAGS@ + FFLAGS=@AM_FFLAGS@ @FFLAGS@ + ++CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) ++ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) ++ F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) ++endif ++ + ## The next two are important to actually rebuild them when a change + ## is made to the the functions they link to. + OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct +@@ -73,7 +79,7 @@ + $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@ + + $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F) +- $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ ++ $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@ + + $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC) + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-tisean.mk Tue Aug 25 08:40:44 2015 -0400 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-tisean +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.2.3 +$(PKG)_CHECKSUM := a2efabaceb420b7bacb5808fc3887352ebe62102 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := tisean-$($(PKG)_VERSION) +$(PKG)_FILE := tisean-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download +$(PKG)_DEPS := +ifeq ($(USE_SYSTEM_GCC),no) + $(PKG)_DEPS += libgomp +endif + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \ + $(SED) -n 's,.*title="tisean-\([0-9][^"]*\).tar.gz".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef