Mercurial > mxe-octave

annotate src/of-optim-1-nargin.patch @ 6213:5f64fb928091 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents 8df7db467c66
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6185
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 # HG changeset patch
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 # User Olaf Till <i7tiol@t-online.de>
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 # Date 1650012368 -7200
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 # Fri Apr 15 10:46:08 2022 +0200
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 # Node ID 197b5a882a41bc9945b6df95f0ef1fb2c7bfc82f
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 # Parent 83eefe952baafe45135fac7f6ea23debde2f7267
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 avoid 'too many arguments' in fmincon with user-supplied gradient
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 * inst/fmincon.m: Define anonymous function f.dftp with (unused)
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 'varargin'.
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 diff -r 83eefe952baa -r 197b5a882a41 inst/fmincon.m
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 --- a/inst/fmincon.m Sun Apr 10 16:31:04 2022 +0200
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 +++ b/inst/fmincon.m Fri Apr 15 10:46:08 2022 +0200
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 @@ -217,7 +217,7 @@
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 o.df_equc_idx = false;
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 if (strcmp (o.GradObj, "on"))
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 - f.dfdp = @ (p) out_2_wrapper (f.objf, p);
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 + f.dfdp = @ (p, varargin) out_2_wrapper (f.objf, p);
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 dfdp_specified = true;
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 else
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 f.dfdp = @ __dfdp__;
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 Cross-building the docs doesn't work with the generic build rules in MXE Octave.
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 De-activate building them (and use the existing docs from the tarball).
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 diff -urN optim-1.6.2/src/Makefile.in.orig optim-1.6.2/src/Makefile.in
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 --- optim-1.6.2/src/Makefile.in.orig 2022-04-10 16:31:04.000000000 +0200
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 +++ optim-1.6.2/src/Makefile.in 2022-04-22 19:48:02.532175109 +0200
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 @@ -61,7 +61,7 @@
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 .INTERMEDIATE: MFDOCSTRINGS $(DSFILES)
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 -all: doc $(OCTFILES)
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 +all: $(OCTFILES)
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 prebuild: doc html
8df7db467c66 of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38