Mercurial > mxe-octave

changeset 3420:207b5f6713d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update fl-core for current release patch Makefile.in: add fl-core to octave forge package list src/of-fl-core-1-fixes.patch: update patch for current release. src/of-fl-core.mk: Update checksum
author John Donoghue <john.donoghue@ieee.org>
date Mon, 13 Jan 2014 21:27:34 -0500
parents e7e29aeea726
children 7e0b4087cd58
files Makefile.in src/of-fl-core-1-fixes.patch src/of-fl-core.mk
diffstat 3 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Mon Jan 13 18:26:59 2014 -0500
+++ b/Makefile.in	Mon Jan 13 21:27:34 2014 -0500
@@ -350,7 +350,7 @@
 endif
 
 OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases'
-OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits)
+OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core)
 
 MAKE_SHARED_FROM_STATIC := \
   $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS)
--- a/src/of-fl-core-1-fixes.patch	Mon Jan 13 18:26:59 2014 -0500
+++ b/src/of-fl-core-1-fixes.patch	Mon Jan 13 21:27:34 2014 -0500
@@ -1,17 +1,18 @@
---- Makefile.sf	2014-01-12 21:32:17 -0500
-+++ Makefile	2014-01-12 21:40:00 -0500
-@@ -3,10 +3,14 @@
+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 @@
+ OCT = fl_compose.oct
+ SRC := $(OCT:.oct=.cc)
  BASE := $(OCT:.oct=)
- 
- ifdef COMSPEC 
+-ifdef COMSPEC 
++
 +ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE)))
 +	ADDPARAM := -lpthread
 +else
- ifneq ($(shell uname -o),Cygwin)
++ ifdef COMSPEC 
  	ADDPARAM := -lpthreadVC2
++ endif
  endif
- endif
-+endif
  
  .phony: all
- all: $(OCT)
--- a/src/of-fl-core.mk	Mon Jan 13 18:26:59 2014 -0500
+++ b/src/of-fl-core.mk	Mon Jan 13 21:27:34 2014 -0500
@@ -3,7 +3,7 @@
 
 PKG             := of-fl-core
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 6aecd4611879acaae1918025148cc09e197e0e82
+$(PKG)_CHECKSUM := 15c22155457f2eaf3d2531cd8a652732d9b7ebce
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := fl-core
 $(PKG)_FILE     := fl-core-$($(PKG)_VERSION).tar.gz