Mercurial > mxe-octave

diff src/of-fl-core-1-fixes.patch @ 3854:85568f3159a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
binary-packages: update for cross tools * Makefile.in: add MXE_OCTAVECONFIG and use for of-pkg building * dist-files.mk: add of-fits-1-cross-fixes.patch, of-sockets-1-cross-fixes.patch * src/default-octave.mk: use --enable-cross-tools not --enable-cross-mkoctfile and install octave-config * src/of-fits-1-cross-fixes.patch: new file * src/of-fits.mk: enable package compile * src/of-fl-core-1-fixes.patch: new file * src/of-fl-core.mk: enable pkg conpile * src/of-sockets-1-cross-fixes.patch: new file * src/of-sockets.mk: enable pkg conpile
author John Donoghue
date Fri, 20 Mar 2015 14:39:17 -0400
parents 207b5f6713d9
children b36a7ab4bd2c
line wrap: on
line diff
--- a/src/of-fl-core-1-fixes.patch	Thu Mar 19 14:03:28 2015 -0400
+++ b/src/of-fl-core-1-fixes.patch	Fri Mar 20 14:39:17 2015 -0400
@@ -1,13 +1,16 @@
-diff -ur fl-core.orig/src/Makefile fl-core/src/Makefile
---- fl-core.orig/src/Makefile	2014-01-13 21:23:20.000000000 -0500
-+++ fl-core/src/Makefile	2014-01-13 21:24:15.000000000 -0500
-@@ -1,8 +1,13 @@
+diff -ur fl-core/src/Makefile fl-core.new/src/Makefile
+--- fl-core/src/Makefile	2011-02-06 14:09:03.000000000 -0500
++++ fl-core.new/src/Makefile	2015-03-20 13:45:48.577323118 -0400
+@@ -1,15 +1,23 @@
  OCT = fl_compose.oct
  SRC := $(OCT:.oct=.cc)
  BASE := $(OCT:.oct=)
 -ifdef COMSPEC 
 +
-+ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE)))
++MKOCTFILE ?= mkoctfile
++OCTAVECONFIG ?= octave-config
++
++ifneq (,$(findstring mingw,$(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE)))
 +	ADDPARAM := -lpthread
 +else
 + ifdef COMSPEC 
@@ -16,3 +19,11 @@
  endif
  
  .phony: all
+ all: $(OCT)
+ 
+ %.oct: %.cc
+-	mkoctfile -s $< $(ADDPARAM)
++	$(MKOCTFILE) -s $< $(ADDPARAM)
+ 
+ .phony: clean
+ clean: