view src/of-ltfat-2-LDFLAGS.patch @ 7186:19a46de50b18 default tip @

* src/jasper.mk: update to v4.2.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 02 May 2024 09:22:30 -0400
parents 9c2862093788
children
line wrap: on
line source

From a4a28fae940e37db61b598ed0ed887f358fbfe1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
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