Mercurial > mxe-octave

annotate src/of-database-1-cross-fixes.patch @ 4114:02c9f7e9792e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge away extra head on default
author John W. Eaton <jwe@octave.org>
date Wed, 23 Mar 2016 08:50:22 -0400
parents 07a298959dc3
children 9ded338051db
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4109
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
1 # HG changeset patch
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
2 # User John Donoghue <john.donoghue@ieee.org>
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
3 # Date 1458419460 14400
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
4 # Sat Mar 19 16:31:00 2016 -0400
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
5 # Node ID ff3a96a08ec915983ef9a1c189404578b00d2db4
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
6 # Parent 8e13dd6c295b004fb3e8df97b4ef6438b61bcf19
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
7 Check mingw hosttype via octave config (Bug #44795)
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
8
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
9 * src/Makefile.in: get CANONICAL_HOST_TYPE from octave-config to check target OS for using ws2_32
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
10
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
11 diff -r 8e13dd6c295b -r ff3a96a08ec9 src/Makefile.in
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
12 --- a/src/Makefile.in Sat Mar 19 08:20:47 2016 +0100
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
13 +++ b/src/Makefile.in Sat Mar 19 16:31:00 2016 -0400
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
14 @@ -17,9 +17,12 @@
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
15
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
16 MKOCTFILE ?= @MKOCTFILE@
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
17 PG_CONFIG ?= @PG_CONFIG@
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
18 +OCTAVE_CONFIG ?= @OCTAVE_CONFIG@
3892
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
19 +
4109
07a298959dc3 of-database: update to 2.4.1
John Donoghue <john.donoghue@ieee.org>
parents: 3892
diff changeset
20 +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
3892
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
21
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
22 EXTRALIBS =
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
23 -ifeq ($(OS),Windows_NT)
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
24 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
25 EXTRALIBS = -lws2_32
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
26 endif
b42e8f913ddc of-database: added of package
John Donoghue
parents:
diff changeset
27