Mercurial > mxe-octave

annotate src/of-tisean-1-fixes.patch @ 5947:09d3533acacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-cmake.mk, src/cmake.mk: update v3.21.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 11 Nov 2021 09:49:11 -0500
parents 2477e9d2f43e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
5 MKOCTFILE ?= mkoctfile -Wall
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
6 +OCTAVE_CONFIG ?= octave-config
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
7 SED ?= sed
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
8 LIBS_F=source_f/libsla.a
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
9 CXXFLAGS=@CXXFLAGS@
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
10 FFLAGS=@AM_FFLAGS@ @FFLAGS@
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
11
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
12 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
13 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
14 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS)
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
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
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
19 +
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
20 ## The next two are important to actually rebuild them when a change
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
21 ## is made to the the functions they link to.
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
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
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
24 $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
25
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
26 $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F)
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
27 - $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
28 + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
29
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
30 $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC)
f3d167e40f01 of-tisean: add new package
John Donoghue
parents:
diff changeset
31 $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@