Mercurial > mxe-octave
comparison src/of-sockets-1-cross-fixes.patch @ 3854:85568f3159a4
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 |
comparison
equal
deleted
inserted
replaced
| 3853:58935b4de51f | 3854:85568f3159a4 |
|---|---|
| 1 diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile | |
| 2 --- octave-sockets-1.2.0.orig/src/Makefile 2015-03-20 10:24:40.824141293 -0400 | |
| 3 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400 | |
| 4 @@ -8,12 +8,15 @@ | |
| 5 SRC := $(OCT:.oct=.cc) | |
| 6 | |
| 7 MKOCTFILE ?= mkoctfile -Wall | |
| 8 +OCTAVECONFIG ?= octave-config | |
| 9 OCTAVE ?= octave | |
| 10 | |
| 11 +CANONICAL_HOST_TYPE := $(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE)) | |
| 12 + | |
| 13 #The following is necessary to get the sockets package working in Windows. | |
| 14 #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw) | |
| 15 EXTRALIBS := | |
| 16 -ifeq ($(OS),Windows_NT) | |
| 17 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) | |
| 18 EXTRALIBS := -lws2_32 | |
| 19 endif | |
| 20 |