Mercurial > mxe-octave
changeset 6069:0bf2a154ef3e
of-ltfat: Don't force -std=gnu++11. We prefer a newer standard now.
* src/of-ltfat-3-no-cxx11.patch: Add new patch.
* dist-files.mk: Include new patch.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Wed, 26 Jan 2022 19:07:00 +0100 |
| parents | b916a190b939 |
| children | 8d1aecf2d2d6 |
| files | dist-files.mk src/of-ltfat-3-no-cxx11.patch |
| diffstat | 2 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Wed Jan 26 18:49:44 2022 +0100 +++ b/dist-files.mk Wed Jan 26 19:07:00 2022 +0100 @@ -506,6 +506,7 @@ of-lssa.mk \ of-ltfat-1-cross-fixes.patch \ of-ltfat-2-LDFLAGS.patch \ + of-ltfat-3-no-cxx11.patch \ of-ltfat.mk \ of-matgeom.mk \ of-mapping.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-ltfat-3-no-cxx11.patch Wed Jan 26 19:07:00 2022 +0100 @@ -0,0 +1,27 @@ +From 0b0d59759fd3ef0f3c631047f85a2b87c687d272 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Wed, 26 Jan 2022 18:58:46 +0100 +Subject: [PATCH] Don't force std=gnu++11. We prefer a newer standard now. + Ideally, this would check if some switch is necessary to enable C++11 feature + support in the compiler. + +--- + oct/Makefile_unix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oct/Makefile_unix b/oct/Makefile_unix +index 8f497297..4ecad22a 100644 +--- a/oct/Makefile_unix ++++ b/oct/Makefile_unix +@@ -33,7 +33,7 @@ ifndef FFTW_LIBS + FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS) + endif + +-export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -std=gnu++11 -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS) ++export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS) + # export is necessary, otherwise LDFLAGS won't have any effect + # at least on Windows and on Mac + export LDFLAGS := $(shell $(MKOCTFILE) -p LDFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) +-- +2.34.1.windows.1 +