Re: Octave 6.0.90 test release available on alpha.gnu.org
Markus Mützel <[email protected]>
| Newsgroups | gmane.comp.gnu.octave.maintainers |
|---|---|
| Message-ID | <trinity-37dd27ab-f8fd-4540-b752-5094c160ba62-1600104714624@3c-app-gmx-bap10> |
Am 14. September 2020 um 18:46 Uhr schrieb "Rik": > Am 14. September 2020 um 16:13 Uhr schrieb "Markus Mützel": > > Alternatively (and probably easier and less messy), we could probably add the necessary -L flags in the make rule: > > https://hg.savannah.gnu.org/hgweb/octave/file/5d4b400e4b66/test/mex/module.mk > > If this approach works, I like it as being a minimal change. > Please, see the attached patch. It would be nice if someone on MacOS could test this. Markus
build_mkmexfile.patch
(application/octet-stream, 1.7 KB)
# HG changeset patch # User Markus Mützel <[email protected]> # Date 1600104121 -7200 # Mon Sep 14 19:22:01 2020 +0200 # Node ID c794e58a72e08db282c6fe0583e6a5536ce17e0e # Parent 3eb2fab71028caca90490e3a9c5af96fa752b1cf build: Add -L flags to Octave libraries for MKOCTFILE and MKMEXFILE commands. * test/mex/module.mk: .oct and .mex files are linked with -loctinterp -loctave on MacOS. Add -L flags with path to these libraries when calling mkoctfile. diff -r 3eb2fab71028 -r c794e58a72e0 test/mex/module.mk --- a/test/mex/module.mk Fri Sep 20 08:48:45 2019 +0200 +++ b/test/mex/module.mk Mon Sep 14 19:22:01 2020 +0200 @@ -12,8 +12,8 @@ MEX_TEST_FUNCTIONS = $(MEX_TEST_SRC:%.c=%.mex) ## Since these definitions for MKOCTFILE and MKMEXFILE are only used -## here, defining them in this file is probably OK. If there are ever -## used elsewhre, maybe then they could be moved to build-aux/module.mk +## here, defining them in this file is probably OK. If they are ever +## used elsewhere, maybe then they could be moved to build-aux/module.mk ## or the main Makefile.am file. The MKOCTFILE variables are included ## for completeness, in case we someday want to test building .oct ## files as well. @@ -31,13 +31,17 @@ ## And probably many others... MKOCTFILECPPFLAGS = \ -I$(top_srcdir)/libinterp/corefcn \ - -Ilibinterp/corefcn + -Ilibinterp/corefcn \ + -L$(top_builddir)/libinterp/.lib \ + -L$(top_builddir)/liboctave/.lib MKOCTFILE = $(top_builddir)/src/mkoctfile $(MKOCTFILECPPFLAGS) MKMEXFILECPPFLAGS = \ -I$(top_srcdir)/libinterp/corefcn \ - -Ilibinterp/corefcn + -Ilibinterp/corefcn \ + -L$(top_builddir)/libinterp/.lib \ + -L$(top_builddir)/liboctave/.lib MKMEXFILE = $(top_builddir)/src/mkoctfile --mex $(MKMEXFILECPPFLAGS)