Mercurial > mxe-octave

view src/of-sockets-1-cross-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
children 9ceedf18871e
line wrap: on
line source

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