1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
|
$NetBSD: patch-configure,v 1.8 2018/12/26 10:45:46 adam Exp $
Regen.
install .oct loadable modules with INSTALL_LIB to avoid stripping them
we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
use this value due to an error.
the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample
over our own tools:
https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
Allow overriding MKOCTFILE_F77 so we can provide the full path to gfortran
(for building octave-forge packages like control)
Additional changes are due to autoconf changes.
--- configure.orig 2018-08-09 18:20:32.000000000 +0000
+++ configure
@@ -761,10 +761,6 @@ ac_ct_QHELPGENERATOR
QHELPGENERATOR
ac_ct_QHELPGENERATOR_QTVER
QHELPGENERATOR_QTVER
-ac_ct_QCOLLECTIONGENERATOR
-QCOLLECTIONGENERATOR
-ac_ct_QCOLLECTIONGENERATOR_QTVER
-QCOLLECTIONGENERATOR_QTVER
ac_ct_LRELEASE
LRELEASE
ac_ct_LRELEASE_QTVER
@@ -1733,6 +1729,7 @@ INCLUDE_NEXT_AS_FIRST_DIRECTIVE
INCLUDE_NEXT
LIB_CRYPTO
pkglibexecdir
+runstatedir
lispdir
REPLACE_FDOPENDIR
REPLACE_DIRFD
@@ -2092,6 +2089,7 @@ PYTHON
DEFAULT_PAGER
GNUPLOT
GHOSTSCRIPT
+INSTALL_LIB
LN_S
REPRODUCIBLE_TAR_FLAGS
TEXI2PDF
@@ -2221,7 +2219,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -2446,7 +2443,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -2699,15 +2695,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -2845,7 +2832,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -2998,7 +2985,6 @@ Fine tuning of the installation director
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -6043,7 +6029,7 @@ case $host_os in *\ *) host_os=`echo "$h
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: configuring Octave for unknown system type" >&5
$as_echo "$as_me: WARNING: configuring Octave for unknown system type" >&2;}
fi
- canonical_host_type=$host
+ canonical_host_type=$host_alias
if test -z "$host_cpu"; then
host_cpu=unknown
@@ -9414,7 +9400,10 @@ fi
-INSTALL_SCRIPT="${INSTALL}"
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
+
## Programs used when running Octave.
@@ -12974,6 +12963,11 @@ fi
done
;;
-[lLR]*)
+ case $ac_arg in
+ -R*)
+ ac_arg="-Wl,$ac_arg"
+ ;;
+ esac
ac_exists=false
for ac_i in $ac_cv_f77_libs; do
if test x"$ac_arg" = x"$ac_i"; then
@@ -34971,13 +34965,13 @@ if test "$cross_compiling" = yes && test
MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"`
MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"`
else
- MKOCTFILE_AR="$AR"
- MKOCTFILE_CC="$CC"
- MKOCTFILE_CXX="$CXX"
- MKOCTFILE_DL_LD="$DL_LD"
- MKOCTFILE_F77="$F77"
- MKOCTFILE_LD_CXX="$LD_CXX"
- MKOCTFILE_RANLIB="$RANLIB"
+ MKOCTFILE_AR="${MKOCTFILE_AR-$AR}"
+ MKOCTFILE_CC="${MKOCTFILE_CC-$CC}"
+ MKOCTFILE_CXX="${MKOCTFILE_CXX-$CXX}"
+ MKOCTFILE_DL_LD="${MKOCTFILE_DL_LD-$DL_LD}"
+ MKOCTFILE_F77="${MKOCTFILE_F77-$F77}"
+ MKOCTFILE_LD_CXX="${MKOCTFILE_LD_CXX-$LD_CXX}"
+ MKOCTFILE_RANLIB="${MKOCTFILE_RANLIB-$RANLIB}"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX" >&5
$as_echo "$as_me: defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX" >&6;}
@@ -36091,6 +36085,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+# include <stdlib.h>
# else
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
@@ -71654,221 +71650,6 @@ fi
if test -n "$ac_tool_prefix"; then
- for ac_prog in qcollectiongenerator-qt$qt_version
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_QCOLLECTIONGENERATOR_QTVER+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$QCOLLECTIONGENERATOR_QTVER"; then
- ac_cv_prog_QCOLLECTIONGENERATOR_QTVER="$QCOLLECTIONGENERATOR_QTVER" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_QCOLLECTIONGENERATOR_QTVER="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-QCOLLECTIONGENERATOR_QTVER=$ac_cv_prog_QCOLLECTIONGENERATOR_QTVER
-if test -n "$QCOLLECTIONGENERATOR_QTVER"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QCOLLECTIONGENERATOR_QTVER" >&5
-$as_echo "$QCOLLECTIONGENERATOR_QTVER" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$QCOLLECTIONGENERATOR_QTVER" && break
- done
-fi
-if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
- ac_ct_QCOLLECTIONGENERATOR_QTVER=$QCOLLECTIONGENERATOR_QTVER
- for ac_prog in qcollectiongenerator-qt$qt_version
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER"; then
- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER="$ac_ct_QCOLLECTIONGENERATOR_QTVER" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_QCOLLECTIONGENERATOR_QTVER=$ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER
-if test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QCOLLECTIONGENERATOR_QTVER" >&5
-$as_echo "$ac_ct_QCOLLECTIONGENERATOR_QTVER" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER" && break
-done
-
- if test "x$ac_ct_QCOLLECTIONGENERATOR_QTVER" = x; then
- QCOLLECTIONGENERATOR_QTVER=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- QCOLLECTIONGENERATOR_QTVER=$ac_ct_QCOLLECTIONGENERATOR_QTVER
- fi
-fi
-
- if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in qcollectiongenerator
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_QCOLLECTIONGENERATOR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$QCOLLECTIONGENERATOR"; then
- ac_cv_prog_QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_QCOLLECTIONGENERATOR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-QCOLLECTIONGENERATOR=$ac_cv_prog_QCOLLECTIONGENERATOR
-if test -n "$QCOLLECTIONGENERATOR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QCOLLECTIONGENERATOR" >&5
-$as_echo "$QCOLLECTIONGENERATOR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$QCOLLECTIONGENERATOR" && break
- done
-fi
-if test -z "$QCOLLECTIONGENERATOR"; then
- ac_ct_QCOLLECTIONGENERATOR=$QCOLLECTIONGENERATOR
- for ac_prog in qcollectiongenerator
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_QCOLLECTIONGENERATOR"; then
- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR="$ac_ct_QCOLLECTIONGENERATOR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_QCOLLECTIONGENERATOR=$ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR
-if test -n "$ac_ct_QCOLLECTIONGENERATOR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QCOLLECTIONGENERATOR" >&5
-$as_echo "$ac_ct_QCOLLECTIONGENERATOR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_QCOLLECTIONGENERATOR" && break
-done
-
- if test "x$ac_ct_QCOLLECTIONGENERATOR" = x; then
- QCOLLECTIONGENERATOR=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- QCOLLECTIONGENERATOR=$ac_ct_QCOLLECTIONGENERATOR
- fi
-fi
-
- if test -n "$QCOLLECTIONGENERATOR"; then
- if test -n "$QTCHOOSER"; then
- QCOLLECTIONGENERATORFLAGS="-qt$qt_version"
- fi
- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
- else
- QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
- fi
- else
- QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR_QTVER"
- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
- fi
-
-
- if test -n "$ac_tool_prefix"; then
for ac_prog in qhelpgenerator-qt$qt_version
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -72084,7 +71865,7 @@ fi
if test -n "$QT_TOOLS_MISSING"; then
- warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
+ warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, and qhelpgenerator not found; disabling Qt GUI"
build_qt_gui=no
MOC_QTVER=
UIC_QTVER=
|
