# HG changeset patch
# User John Donoghue
# Date 1426876757 14400
# Node ID 85568f3159a42768137af51dabaabe6674271c48
# Parent  58935b4de51f380b38b1793a327aa83ecfef6de2
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

diff -r 58935b4de51f -r 85568f3159a4 Makefile.in
--- a/Makefile.in	Thu Mar 19 14:03:28 2015 -0400
+++ b/Makefile.in	Fri Mar 20 14:39:17 2015 -0400
@@ -315,6 +315,7 @@
   MXE_RCC := $(HOST_BINDIR)/rcc
 
   MXE_MKOCTFILE := $(HOST_BINDIR)/mkoctfile
+  MXE_OCTAVECONFIG := $(HOST_BINDIR)/octave-config
 else
   MXE_TOOL_PREFIX := $(TARGET)-
   MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar'
@@ -339,6 +340,7 @@
   MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
 
   MXE_MKOCTFILE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)mkoctfile'
+  MXE_OCTAVECONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)octave-config'
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
@@ -590,11 +592,13 @@
   if [ -d '$(1)/src' ]; then \
     if [ -f '$(1)/src/configure' ]; then \
       cd '$(1)/src' && ./configure $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) MKOCTFILE='$(MXE_MKOCTFILE)'\
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) MKOCTFILE='$(MXE_MKOCTFILE)' \
+        OCTAVECONFIG='$(MXE_OCTAVECONFIG)' \
         $(4); \
     fi; \
     if [ -f '$(1)/src/Makefile' ]; then \
-      $(MAKE) -C '$(1)/src' MKOCTFILE='$(MXE_MKOCTFILE) --verbose'; \
+      $(MAKE) -C '$(1)/src' MKOCTFILE='$(MXE_MKOCTFILE) --verbose' \
+        OCTAVECONFIG='$(MXE_OCTAVECONFIG)'; \
     fi; \
   fi
 endef
diff -r 58935b4de51f -r 85568f3159a4 dist-files.mk
--- a/dist-files.mk	Thu Mar 19 14:03:28 2015 -0400
+++ b/dist-files.mk	Fri Mar 20 14:39:17 2015 -0400
@@ -450,6 +450,7 @@
   of-control.mk \
   of-data-smoothing.mk \
   of-dicom.mk \
+  of-fits-1-cross-fixes.patch \
   of-fits.mk \
   of-fl-core-1-fixes.patch \
   of-fl-core.mk \
@@ -467,6 +468,7 @@
   of-optim.mk \
   of-quaternion.mk \
   of-signal.mk \
+  of-sockets-1-cross-fixes.patch \
   of-sockets.mk \
   of-specfun.mk \
   of-statistics.mk \
diff -r 58935b4de51f -r 85568f3159a4 src/default-octave.mk
--- a/src/default-octave.mk	Thu Mar 19 14:03:28 2015 -0400
+++ b/src/default-octave.mk	Fri Mar 20 14:39:17 2015 -0400
@@ -91,10 +91,10 @@
   $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
 endif
 
-# if want binary packages and are cross compiling, then we need cross mkoctfile
+# if want binary packages and are cross compiling, then we need cross tools enabled
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
   ifeq ($(MXE_NATIVE_BUILD),no)
-    $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-mkoctfile
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools
   endif
 endif
 
@@ -145,8 +145,11 @@
 
     if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
       cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
-      mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
-      $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
+        mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+        $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+        $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      fi; \
     fi
 
     if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
diff -r 58935b4de51f -r 85568f3159a4 src/of-fits-1-cross-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-fits-1-cross-fixes.patch	Fri Mar 20 14:39:17 2015 -0400
@@ -0,0 +1,18 @@
+diff -ur fits.orig/src/Makefile fits/src/Makefile
+--- fits.orig/src/Makefile	2015-03-20 13:37:26.766478760 -0400
++++ fits/src/Makefile	2015-03-20 13:39:14.198586323 -0400
+@@ -1,4 +1,6 @@
+-MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
++MKOCTFILE ?= mkoctfile
++PKG_CONFIG ?= pkg-config
++MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio)
+ 
+ all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
+ 
+@@ -6,5 +8,5 @@
+ 	rm -f *.oct *.o
+ 
+ %.oct: %.cc
+-	mkoctfile --verbose -Wall $(MKOCT_FLAGS) $<
++	$(MKOCTFILE) --verbose -Wall $(MKOCT_FLAGS) $<
+ 
diff -r 58935b4de51f -r 85568f3159a4 src/of-fits.mk
--- a/src/of-fits.mk	Thu Mar 19 14:03:28 2015 -0400
+++ b/src/of-fits.mk	Fri Mar 20 14:39:17 2015 -0400
@@ -18,5 +18,5 @@
 endef
 
 define $(PKG)_BUILD
-    $(OCTAVE_FORGE_PKG_BUILD_NOCOMPILE)
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
diff -r 58935b4de51f -r 85568f3159a4 src/of-fl-core-1-fixes.patch
--- 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: 
diff -r 58935b4de51f -r 85568f3159a4 src/of-fl-core.mk
--- a/src/of-fl-core.mk	Thu Mar 19 14:03:28 2015 -0400
+++ b/src/of-fl-core.mk	Fri Mar 20 14:39:17 2015 -0400
@@ -18,5 +18,5 @@
 endef
 
 define $(PKG)_BUILD
-    $(OCTAVE_FORGE_PKG_BUILD_NOCOMPILE)
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
diff -r 58935b4de51f -r 85568f3159a4 src/of-sockets-1-cross-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-sockets-1-cross-fixes.patch	Fri Mar 20 14:39:17 2015 -0400
@@ -0,0 +1,20 @@
+diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile
+--- octave-sockets-1.2.0.orig/src/Makefile	2015-03-20 10:24:40.824141293 -0400
++++ octave-sockets-1.2.0/src/Makefile	2015-03-20 11:31:54.325799984 -0400
+@@ -8,12 +8,15 @@
+ SRC := $(OCT:.oct=.cc)
+ 
+ MKOCTFILE ?= mkoctfile -Wall
++OCTAVECONFIG ?= octave-config
+ OCTAVE ?= octave
+ 
++CANONICAL_HOST_TYPE := $(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE))
++
+ #The following is necessary to get the sockets package working in Windows.
+ #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw)
+ EXTRALIBS := 
+-ifeq ($(OS),Windows_NT)
++ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
+   EXTRALIBS := -lws2_32
+ endif
+ 
diff -r 58935b4de51f -r 85568f3159a4 src/of-sockets.mk
--- a/src/of-sockets.mk	Thu Mar 19 14:03:28 2015 -0400
+++ b/src/of-sockets.mk	Fri Mar 20 14:39:17 2015 -0400
@@ -18,5 +18,5 @@
 endef
 
 define $(PKG)_BUILD
-    $(OCTAVE_FORGE_PKG_BUILD_NOCOMPILE)
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef