Mercurial > mxe-octave

view src/of-tisean-1-fixes.patch @ 5531:eae508c12529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents 2477e9d2f43e
children
line wrap: on
line source

diff -ur tisean-0.2.3.orig/src/Makefile.in tisean-0.2.3/src/Makefile.in
--- tisean-0.2.3.orig/src/Makefile.in	2015-08-24 13:01:27.265995455 -0400
+++ tisean-0.2.3/src/Makefile.in	2015-09-03 12:59:29.934122317 -0400
@@ -1,9 +1,18 @@
 MKOCTFILE ?= mkoctfile -Wall
+OCTAVE_CONFIG ?= octave-config
 SED       ?= sed
 LIBS_F=source_f/libsla.a
 CXXFLAGS=@CXXFLAGS@
 FFLAGS=@AM_FFLAGS@ @FFLAGS@
 
+CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
+ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
+  F77LIBS := $(shell $(MKOCTFILE) -p FLIBS)
+endif
+ifneq (,$(findstring cygwin,$(CANONICAL_HOST_TYPE)))
+  F77LIBS := $(shell $(MKOCTFILE) -p FLIBS)
+endif
+
 ## The next two are important to actually rebuild them when a change
 ## is made to the the functions they link to.
 OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct
@@ -73,7 +82,7 @@
 	$(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@
 
 $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F)
-	$(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@
+	$(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@
 
 $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC)
 	$(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@