Mercurial > mxe-octave

annotate src/of-sockets-1-cross-fixes.patch @ 4673:010dc6a420ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stable-octave: bump version number
author John W. Eaton <jwe@octave.org>
date Thu, 19 Apr 2018 21:57:06 -0400
parents 9ceedf18871e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
1 diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
2 --- octave-sockets-1.2.0.orig/src/Makefile 2015-03-20 10:24:40.824141293 -0400
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
3 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
4 @@ -8,12 +8,15 @@
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
5 SRC := $(OCT:.oct=.cc)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
6
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
7 MKOCTFILE ?= mkoctfile -Wall
3858
9ceedf18871e use OCTAVE_CONFIG as octave-config variable name
John Donoghue <john.donoghue@ieee.org>
parents: 3854
diff changeset
8 +OCTAVE_CONFIG ?= octave-config
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
9 OCTAVE ?= octave
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
10
3858
9ceedf18871e use OCTAVE_CONFIG as octave-config variable name
John Donoghue <john.donoghue@ieee.org>
parents: 3854
diff changeset
11 +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
12 +
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
13 #The following is necessary to get the sockets package working in Windows.
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
14 #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
15 EXTRALIBS :=
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
16 -ifeq ($(OS),Windows_NT)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
17 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
18 EXTRALIBS := -lws2_32
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
19 endif
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents:
diff changeset
20