# HG changeset patch # User Markus Mützel # Date 1638127944 -3600 # Node ID 9c2862093788f1276052d7c3ff8eb1f8bfe2e8e4 # Parent 3be68b84098a67c0c0e8e3fa897770d733e519c8 of-ltfat: Also set LDFLAGS (bug #61576). * src/of-ltfat-2-LDFLAGS.patch: Also set LDFLAGS (to the same value as LFLAGS). * dist-files.mk: Add new file to dist. diff -r 3be68b84098a -r 9c2862093788 dist-files.mk --- a/dist-files.mk Sun Nov 28 20:28:28 2021 +0100 +++ b/dist-files.mk Sun Nov 28 20:32:24 2021 +0100 @@ -511,6 +511,7 @@ of-linear-algebra.mk \ of-lssa.mk \ of-ltfat-1-cross-fixes.patch \ + of-ltfat-2-LDFLAGS.patch \ of-ltfat.mk \ of-matgeom.mk \ of-mapping.mk \ diff -r 3be68b84098a -r 9c2862093788 src/of-ltfat-2-LDFLAGS.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-ltfat-2-LDFLAGS.patch Sun Nov 28 20:32:24 2021 +0100 @@ -0,0 +1,33 @@ +From a4a28fae940e37db61b598ed0ed887f358fbfe1f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= +Date: Sun, 28 Nov 2021 20:04:06 +0100 +Subject: [PATCH] Use LDFLAGS instead of LFLAGS (bug #61576). + +* oct/Makefile_unix: Use LDFLAGS instead of LFLAGS. The latter was misnamed and +removed in Octave 8. Keep setting LFLAGS for older versions of Octave (prior +to version 7). +--- + oct/Makefile_unix | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/oct/Makefile_unix b/oct/Makefile_unix +index 8f497297..20edbbc3 100644 +--- a/oct/Makefile_unix ++++ b/oct/Makefile_unix +@@ -34,9 +34,11 @@ FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS) + endif + + export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -std=gnu++11 -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS) +-# export is necessary, otherwise LFLAGS won't have any effect ++# export is necessary, otherwise LDFLAGS won't have any effect + # at least on Windows and on Mac +-export LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) ++export LDFLAGS := $(shell $(MKOCTFILE) -p LDFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) ++# also export as LFLAGS for Octave prior to version 7 ++export LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) + + MKOCTFILEFLAGS = -I../libltfat/modules/libltfat/include -DNDEBUG -L../lib -lltfat + +-- +2.34.1.windows.1 +