Mercurial > mxe-octave

comparison src/of-database-1-cross-fixes.patch @ 3892:b42e8f913ddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-database: added of package * src/of-database.mk: new file * dist-files.mk: add of-database.mk, of-database-1-cross-fixes.patch * Makefile.am: add database to octave forge packages * index.html: add of-database * build_packages.m: add of-database package * src/of-database-1-cross-fixes.patch: new file
author John Donoghue
date Fri, 10 Apr 2015 07:35:38 -0400
parents
children 07a298959dc3
comparison
equal deleted inserted replaced
3891:d135404e71a4 3892:b42e8f913ddc
1 diff -ur database-2.3.1.orig/src/configure database-2.3.1/src/configure
2 --- database-2.3.1.orig/src/configure 2015-04-09 14:43:58.349514050 -0400
3 +++ database-2.3.1/src/configure 2015-04-09 14:55:44.447432890 -0400
4 @@ -591,6 +591,7 @@
5 CFLAGS
6 CC
7 PG_CONFIG
8 +OCTAVE_CONFIG
9 MKOCTFILE
10 OCTAVE
11 OBJEXT
12 @@ -2407,6 +2408,43 @@
13 else
14 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15 $as_echo "no" >&6; }
16 +fi
17 +
18 +
19 +# Extract the first word of "octave-config", so it can be a program name with args.
20 +set dummy octave-config; ac_word=$2
21 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22 +$as_echo_n "checking for $ac_word... " >&6; }
23 +if ${ac_cv_prog_OCTAVE_CONFIG+:} false; then :
24 + $as_echo_n "(cached) " >&6
25 +else
26 + if test -n "$OCTAVE_CONFIG"; then
27 + ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test.
28 +else
29 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
30 +for as_dir in $PATH
31 +do
32 + IFS=$as_save_IFS
33 + test -z "$as_dir" && as_dir=.
34 + for ac_exec_ext in '' $ac_executable_extensions; do
35 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
36 + ac_cv_prog_OCTAVE_CONFIG="octave-config"
37 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
38 + break 2
39 + fi
40 +done
41 + done
42 +IFS=$as_save_IFS
43 +
44 +fi
45 +fi
46 +OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG
47 +if test -n "$OCTAVE_CONFIG"; then
48 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
49 +$as_echo "$OCTAVE_CONFIG" >&6; }
50 +else
51 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
52 +$as_echo "no" >&6; }
53 fi
54
55
56 diff -ur database-2.3.1.orig/src/configure.ac database-2.3.1/src/configure.ac
57 --- database-2.3.1.orig/src/configure.ac 2015-04-09 14:43:58.346513991 -0400
58 +++ database-2.3.1/src/configure.ac 2015-04-09 14:49:01.101482292 -0400
59 @@ -13,6 +13,7 @@
60
61 AC_CHECK_PROG(OCTAVE, octave, octave)
62 AC_CHECK_PROG(MKOCTFILE, mkoctfile, mkoctfile)
63 +AC_CHECK_PROG(OCTAVE_CONFIG, octave-config, octave-config)
64 AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config)
65 if test -z "$PG_CONFIG"; then
66 AC_MSG_ERROR([pg_config not found], 1);
67 diff -ur database-2.3.1.orig/src/Makefile.in database-2.3.1/src/Makefile.in
68 --- database-2.3.1.orig/src/Makefile.in 2015-04-09 14:43:58.348514031 -0400
69 +++ database-2.3.1/src/Makefile.in 2015-04-09 14:51:59.623001539 -0400
70 @@ -1,8 +1,10 @@
71 # We rely on g++ features, configure assures CXX=g++.
72 CXX := @CXX@
73
74 +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
75 +
76 EXTRALIBS =
77 -ifeq ($(OS),Windows_NT)
78 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE)))
79 EXTRALIBS = -lws2_32
80 endif
81