From 3a42c234fe6428dea1ecf651132072f0eace3798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Thu, 5 Nov 2020 18:52:11 +0100 Subject: [PATCH] Fix build failures on Fedora MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit — FCFLAGS needs to contain the compilation flags used when compiling Octave, otherwise it fails at configure stage when looking for gfortran — Explicitly add -L$OCTLIBDIR, because with Octave 5 it is no longer there, and on Fedora the Octave libraries are no in the default linker search path --- mex/build/octave/configure.ac | 2 +- mex/build/octave/mex.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac index 000857eda..dffbe601c 100644 --- a/mex/build/octave/configure.ac +++ b/mex/build/octave/configure.ac @@ -28,7 +28,7 @@ test "$MKOCTFILE" = no && AC_MSG_ERROR([Octave cannot be found]) CC=$($MKOCTFILE -p CC) CXX=$($MKOCTFILE -p CXX) CFLAGS="$($MKOCTFILE -p CFLAGS) -Wall -Wno-parentheses" -FCFLAGS="-g -O2 -Wall" +FCFLAGS="$($MKOCTFILE -p FFLAGS) -Wall -std=gnu" # Override -std=legacy that is in FFLAGS in Octave 5 FFLAGS="$($MKOCTFILE -p FFLAGS) -Wall" CXXFLAGS="$($MKOCTFILE -p CXXFLAGS) -Wall -Wno-parentheses -Wold-style-cast" LDFLAGS="$($MKOCTFILE -p LFLAGS) $($MKOCTFILE -p LDFLAGS)" diff --git a/mex/build/octave/mex.am b/mex/build/octave/mex.am index 14924d268..77eccb3e7 100644 --- a/mex/build/octave/mex.am +++ b/mex/build/octave/mex.am @@ -7,9 +7,9 @@ DEFS += -DMEXEXT=\".mex\" AM_CFLAGS = $(shell $(MKOCTFILE) -p CPICFLAG) AM_FFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG) -AM_FCFLAGS = -fPIC +AM_FCFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG) AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG) -AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS) +AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS) -L"$(shell $(MKOCTFILE) -p OCTLIBDIR)" LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS) LIBS += $(shell $(MKOCTFILE) -p BLAS_LIBS)