Mercurial > mxe-octave

comparison src/of-tisean-1-fixes.patch @ 4021:2477e9d2f43e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-tisean: update patch to include cygwin * src/of-tisean-1-fixes.patch: check for cygwin host
author John Donoghue <john.donoghue@ieee.org>
date Fri, 04 Sep 2015 18:53:24 -0400
parents f3d167e40f01
children
comparison
equal deleted inserted replaced
4020:46c6ddb14417 4021:2477e9d2f43e
1 # HG changeset patch 1 diff -ur tisean-0.2.3.orig/src/Makefile.in tisean-0.2.3/src/Makefile.in
2 # User John Donoghue 2 --- tisean-0.2.3.orig/src/Makefile.in 2015-08-24 13:01:27.265995455 -0400
3 # Date 1440511254 14400 3 +++ tisean-0.2.3/src/Makefile.in 2015-09-03 12:59:29.934122317 -0400
4 # Tue Aug 25 10:00:54 2015 -0400 4 @@ -1,9 +1,18 @@
5 # Node ID 6ccac6d363c9082ab3898e7220ca1b3e3bb09043
6 # Parent 1bbc3eb050ac4fcb6704e43ef11dc809c0a83e55
7 Use FLIB settings from mkoctfile in mingw build
8
9 * src/Makefile.in: set F77LIBS to mkoctfile values and use in link
10
11 diff -r 1bbc3eb050ac -r 6ccac6d363c9 src/Makefile.in
12 --- a/src/Makefile.in Fri Aug 14 16:28:35 2015 -0600
13 +++ b/src/Makefile.in Tue Aug 25 10:00:54 2015 -0400
14 @@ -1,9 +1,15 @@
15 MKOCTFILE ?= mkoctfile -Wall 5 MKOCTFILE ?= mkoctfile -Wall
16 +OCTAVE_CONFIG ?= octave-config 6 +OCTAVE_CONFIG ?= octave-config
17 SED ?= sed 7 SED ?= sed
18 LIBS_F=source_f/libsla.a 8 LIBS_F=source_f/libsla.a
19 CXXFLAGS=@CXXFLAGS@ 9 CXXFLAGS=@CXXFLAGS@
21 11
22 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) 12 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
23 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) 13 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
24 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) 14 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS)
25 +endif 15 +endif
16 +ifneq (,$(findstring cygwin,$(CANONICAL_HOST_TYPE)))
17 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS)
18 +endif
26 + 19 +
27 ## The next two are important to actually rebuild them when a change 20 ## The next two are important to actually rebuild them when a change
28 ## is made to the the functions they link to. 21 ## is made to the the functions they link to.
29 OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct 22 OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct
30 @@ -73,7 +79,7 @@ 23 @@ -73,7 +82,7 @@
31 $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@ 24 $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@
32 25
33 $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F) 26 $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F)
34 - $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ 27 - $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@
35 + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@ 28 + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@