Mercurial > mxe-octave

annotate src/of-ltfat-2-LDFLAGS.patch @ 6234:97c5f8da5036 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/librsb.mk: update to 1.2.0.11
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 27 May 2022 12:24:32 +0200
parents 9c2862093788
children 233137818bb1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From a4a28fae940e37db61b598ed0ed887f358fbfe1f Mon Sep 17 00:00:00 2001
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Sun, 28 Nov 2021 20:04:06 +0100
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] Use LDFLAGS instead of LFLAGS (bug #61576).
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 * oct/Makefile_unix: Use LDFLAGS instead of LFLAGS. The latter was misnamed and
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 removed in Octave 8. Keep setting LFLAGS for older versions of Octave (prior
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 to version 7).
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 ---
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 oct/Makefile_unix | 6 ++++--
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 1 file changed, 4 insertions(+), 2 deletions(-)
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 diff --git a/oct/Makefile_unix b/oct/Makefile_unix
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 index 8f497297..20edbbc3 100644
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 --- a/oct/Makefile_unix
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 +++ b/oct/Makefile_unix
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 @@ -34,9 +34,11 @@ FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS)
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 endif
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -std=gnu++11 -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS)
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 -# export is necessary, otherwise LFLAGS won't have any effect
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 +# export is necessary, otherwise LDFLAGS won't have any effect
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 # at least on Windows and on Mac
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 -export LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS)
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 +export LDFLAGS := $(shell $(MKOCTFILE) -p LDFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS)
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 +# also export as LFLAGS for Octave prior to version 7
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 +export LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS)
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 MKOCTFILEFLAGS = -I../libltfat/modules/libltfat/include -DNDEBUG -L../lib -lltfat
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 --
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 2.34.1.windows.1
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33