Mercurial > mxe-octave
comparison src/of-tisean-1-fixes.patch @ 4015:f3d167e40f01
of-tisean: add new package
* Makefile.in: add tisean package
* build_packages.m: add tisean package to installer
* dist-files.mk: update for of-tisean-1-fortran.patch, of-tisean.mk
* src/of-tisean-1-fortran.patch: new file
* src/of-tisean.mk: new file
author | John Donoghue |
---|---|
date | Tue, 25 Aug 2015 08:40:44 -0400 |
parents | |
children | 2477e9d2f43e |
comparison
equal
deleted
inserted
replaced
4014:9eca3f114683 | 4015:f3d167e40f01 |
---|---|
1 # HG changeset patch | |
2 # User John Donoghue | |
3 # Date 1440511254 14400 | |
4 # Tue Aug 25 10:00:54 2015 -0400 | |
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 | |
16 +OCTAVE_CONFIG ?= octave-config | |
17 SED ?= sed | |
18 LIBS_F=source_f/libsla.a | |
19 CXXFLAGS=@CXXFLAGS@ | |
20 FFLAGS=@AM_FFLAGS@ @FFLAGS@ | |
21 | |
22 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) | |
23 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) | |
24 + F77LIBS := $(shell $(MKOCTFILE) -p FLIBS) | |
25 +endif | |
26 + | |
27 ## The next two are important to actually rebuild them when a change | |
28 ## is made to the the functions they link to. | |
29 OCT_LINK_F=__surrogates__.oct __c1__.oct __upo__.oct lazy.oct | |
30 @@ -73,7 +79,7 @@ | |
31 $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@ | |
32 | |
33 $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F) | |
34 - $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ | |
35 + $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) $(F77LIBS) -o $@ | |
36 | |
37 $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC) | |
38 $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@ |