Mercurial > mxe-octave

annotate src/of-fl-core-1-fixes.patch @ 3721:933b99febcf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expand options to support 3 possible sources of octave * configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default) * Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure. * index.html: added master-octave information. * src/default-octave.mk: new file. * src/default-octave-1-docinstall.patch * dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk * binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Oct 2014 22:58:20 -0400
parents 207b5f6713d9
children 85568f3159a4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
1 diff -ur fl-core.orig/src/Makefile fl-core/src/Makefile
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
2 --- fl-core.orig/src/Makefile 2014-01-13 21:23:20.000000000 -0500
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
3 +++ fl-core/src/Makefile 2014-01-13 21:24:15.000000000 -0500
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
4 @@ -1,8 +1,13 @@
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
5 OCT = fl_compose.oct
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
6 SRC := $(OCT:.oct=.cc)
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 BASE := $(OCT:.oct=)
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
8 -ifdef COMSPEC
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
9 +
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 +ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE)))
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 + ADDPARAM := -lpthread
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 +else
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
13 + ifdef COMSPEC
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 ADDPARAM := -lpthreadVC2
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
15 + endif
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 endif
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 .phony: all