Mercurial > mxe-octave
annotate src/of-tisean-1-fixes.patch @ 5531:eae508c12529
Add build rule for build-octave (bug #49503).
* src/build-octave.mk: Add new build rule for build-octave which can be used for
cross-building binary packages that depend on Octave as a build tool.
* dist-files.mk: Add new file to list.
* index.html: Add new package to list.
* src/of-communications.mk, src/of-image.mk, src/of-mapping.mk,
src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk,
src/of-windows.mk: Add optional dependency on build-octave.
* configure.ac: Add new configure switch "--disable-system-octave" that is
needed to build the build-octave package.
* Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the
default build tools and build it only if a package explicitly depends on it.
Display warning about missing native Octave version only if necessary.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Tue, 08 Sep 2020 23:04:38 +0200 |
parents | 2477e9d2f43e |
children |
rev | line source |
---|---|
4021
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
1 diff -ur tisean-0.2.3.orig/src/Makefile.in tisean-0.2.3/src/Makefile.in |
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
2 --- tisean-0.2.3.orig/src/Makefile.in 2015-08-24 13:01:27.265995455 -0400 |
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
3 +++ tisean-0.2.3/src/Makefile.in 2015-09-03 12:59:29.934122317 -0400 |
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
4 @@ -1,9 +1,18 @@ |
4015 | 5 MKOCTFILE ?= mkoctfile -Wall |
6 +OCTAVE_CONFIG ?= octave-config | |
7 SED ?= sed | |
8 LIBS_F=source_f/libsla.a | |
9 CXXFLAGS=@CXXFLAGS@ | |
10 FFLAGS=@AM_FFLAGS@ @FFLAGS@ | |
11 | |
12 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) | |
13 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) | |
14 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) | |
15 +endif | |
4021
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
16 +ifneq (,$(findstring cygwin,$(CANONICAL_HOST_TYPE))) |
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
17 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) |
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
18 +endif |
4015 | 19 + |
20 ## The next two are important to actually rebuild them when a change | |
21 ## is made to the the functions they link to. | |
22 OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct | |
4021
2477e9d2f43e
of-tisean: update patch to include cygwin
John Donoghue <john.donoghue@ieee.org>
parents:
4015
diff
changeset
|
23 @@ -73,7 +82,7 @@ |
4015 | 24 $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@ |
25 | |
26 $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F) | |
27 - $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ | |
28 + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@ | |
29 | |
30 $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC) | |
31 $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@ |