Mercurial > mxe-octave

annotate src/of-ltfat-2-LDFLAGS.patch @ 7243:ae230ac322f7 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/sqlite.mk: update to v3460000
author John Donoghue <john.donoghue@ieee.org>
date Wed, 05 Jun 2024 10:26:58 -0400
parents 233137818bb1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
1 From c5f12d150d8f4b9b920f6e9511d5629b81333b2b Mon Sep 17 00:00:00 2001
5988
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>
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
3 Date: Fri, 17 May 2024 19:47:39 +0200
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
4 Subject: [PATCH] Keep original LDFLAGS.
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
6 * oct/Makefile_unix: Append to original LDFLAGS. Keep setting LFLAGS for older
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
7 versions of Octave (prior to version 7).
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 ---
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
9 oct/Makefile_unix | 8 ++++----
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
10 1 file changed, 4 insertions(+), 4 deletions(-)
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 diff --git a/oct/Makefile_unix b/oct/Makefile_unix
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
13 index de2bce8e..7b224a03 100644
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/oct/Makefile_unix
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/oct/Makefile_unix
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
16 @@ -34,11 +34,11 @@ FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS)
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 endif
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 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
20 -# 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
21 +# 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
22 # at least on Windows and on Mac
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
23 -export LDFLAGS := -L$(shell $(MKOCTFILE) -p LIBDIR) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS)
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
24 -undefine LFLAGS
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
25 -unexport LFLAGS
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 +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
27 +# 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
28 +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
29
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
30 MKOCTFILEFLAGS = -I../src/modules/libltfat/include -DNDEBUG -L../lib -lltfat
5988
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 --
7206
233137818bb1 of-ltfat: update to version 2.6.0
Markus Mützel <markus.muetzel@gmx.de>
parents: 5988
diff changeset
33 2.44.0.windows.1
5988
9c2862093788 of-ltfat: Also set LDFLAGS (bug #61576).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34