Mercurial > mxe-octave

annotate src/octave.mk @ 4339:07671a76e291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qhull: enable qhull when compiling for 64bit (Bug #50069) * src/default-octave.mk, src/octave.mk, src/stable-octave.mk: make qhull always a dependancy, remove --without-qhull
author John D
date Thu, 19 Jan 2017 07:43:05 -0500
parents 0e35d2f6fc6a
children e9b032b9340a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2862
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 # This file is part of MXE.
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 # See index.html for further information.
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 PKG := octave
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 $(PKG)_IGNORE :=
4244
0e35d2f6fc6a octave.mk: Update to version 4.2.0-rc4.
John W. Eaton <jwe@octave.org>
parents: 4237
diff changeset
6 $(PKG)_VERSION := 4.2.0-rc4
0e35d2f6fc6a octave.mk: Update to version 4.2.0-rc4.
John W. Eaton <jwe@octave.org>
parents: 4237
diff changeset
7 $(PKG)_CHECKSUM := a96a143a2f49306b259535454389d16393853fc4
2874
890aa60f7b87 Temporary Octave patch file, improve Octave config and build.
John W. Eaton <jwe@octave.org>
parents: 2873
diff changeset
8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
4237
1cb1ce8f351c octave: Bump version to 4.2.0-rc3.
John W. Eaton <jwe@octave.org>
parents: 4233
diff changeset
9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz
4065
aacf84e7af56 octave: update to 4.0.1-rc1
John Donoghue
parents: 4049
diff changeset
10 $(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
3208
1080856f48c4 new configure option: --enable-system-fontconfig
John W. Eaton <jwe@octave.org>
parents: 3153
diff changeset
11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
1080856f48c4 new configure option: --enable-system-fontconfig
John W. Eaton <jwe@octave.org>
parents: 3153
diff changeset
12 $(PKG)_FONTCONFIG := fontconfig
1080856f48c4 new configure option: --enable-system-fontconfig
John W. Eaton <jwe@octave.org>
parents: 3153
diff changeset
13 endif
4339
07671a76e291 qhull: enable qhull when compiling for 64bit (Bug #50069)
John D
parents: 4244
diff changeset
14 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qhull qrupdate qscintilla readline suitesparse texinfo zlib
4233
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
15
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
16 ifeq ($(ENABLE_QT5),yes)
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
17 $(PKG)_DEPS += qt5
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
18 else
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
19 $(PKG)_DEPS += qt
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
20 endif
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
21
3743
4f58c4b4dee0 build libX11 and dependencies
John W. Eaton <jwe@octave.org>
parents: 3692
diff changeset
22 ifeq ($(MXE_WINDOWS_BUILD),no)
3827
02990526ae69 allow building of X11 libs to be disabled
John W. Eaton <jwe@octave.org>
parents: 3807
diff changeset
23 ifeq ($(USE_SYSTEM_X11_LIBS),no)
02990526ae69 allow building of X11 libs to be disabled
John W. Eaton <jwe@octave.org>
parents: 3807
diff changeset
24 $(PKG)_DEPS += x11 xext
02990526ae69 allow building of X11 libs to be disabled
John W. Eaton <jwe@octave.org>
parents: 3807
diff changeset
25 endif
3743
4f58c4b4dee0 build libX11 and dependencies
John W. Eaton <jwe@octave.org>
parents: 3692
diff changeset
26 endif
4189
094981f6f787 octave: make gomp a dependancy for octave
John D
parents: 4101
diff changeset
27 ifeq ($(MXE_SYSTEM),mingw)
094981f6f787 octave: make gomp a dependancy for octave
John D
parents: 4101
diff changeset
28 ifeq ($(USE_SYSTEM_GCC),no)
094981f6f787 octave: make gomp a dependancy for octave
John D
parents: 4101
diff changeset
29 $(PKG)_DEPS += libgomp
094981f6f787 octave: make gomp a dependancy for octave
John D
parents: 4101
diff changeset
30 endif
094981f6f787 octave: make gomp a dependancy for octave
John D
parents: 4101
diff changeset
31 endif
3043
cbfe5d38ff2c use configure script to generate Makefile
John W. Eaton <jwe@octave.org>
parents: 3031
diff changeset
32 ifeq ($(ENABLE_JIT),yes)
cbfe5d38ff2c use configure script to generate Makefile
John W. Eaton <jwe@octave.org>
parents: 3031
diff changeset
33 $(PKG)_DEPS += llvm
3333
4372645ff7e3 Add --disable-java option to configure.
Rik <rik@octave.org>
parents: 3327
diff changeset
34 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
3302
3be843f23263 Explicitly disable jit if not jit not enabled
John Donoghue <john.donoghue@ieee.org>
parents: 3276
diff changeset
35 else
3334
324937497c32 Remove 'remove' from JIT disable option
John Donoghue <john.donoghue@ieee.org>
parents: 3333
diff changeset
36 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
3333
4372645ff7e3 Add --disable-java option to configure.
Rik <rik@octave.org>
parents: 3327
diff changeset
37 endif
4372645ff7e3 Add --disable-java option to configure.
Rik <rik@octave.org>
parents: 3327
diff changeset
38
4372645ff7e3 Add --disable-java option to configure.
Rik <rik@octave.org>
parents: 3327
diff changeset
39 ifeq ($(ENABLE_JAVA),no)
4372645ff7e3 Add --disable-java option to configure.
Rik <rik@octave.org>
parents: 3327
diff changeset
40 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java
3369
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
41 else
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
42 ifeq ($(MXE_SYSTEM),mingw)
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
43 ifeq ($(MXE_NATIVE_BUILD),no)
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
44 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
3527
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
45 --with-java-includedir="$(HOST_INCDIR)/java"
3369
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
46 endif
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
47 endif
3043
cbfe5d38ff2c use configure script to generate Makefile
John W. Eaton <jwe@octave.org>
parents: 3031
diff changeset
48 endif
2862
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
3849
e50c777c9a97 explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands
John W. Eaton <jwe@octave.org>
parents: 3837
diff changeset
50 ## If we allow the system Qt libraries to be used, then these
e50c777c9a97 explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands
John W. Eaton <jwe@octave.org>
parents: 3837
diff changeset
51 ## won't make sense.
e50c777c9a97 explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands
John W. Eaton <jwe@octave.org>
parents: 3837
diff changeset
52 $(PKG)_QT_CONFIGURE_OPTIONS := \
3851
c55d9f182272 use MXE_XXXX tools for octave qt compiling (Bug 44563)
John Donoghue
parents: 3849
diff changeset
53 MOC=$(MXE_MOC) \
c55d9f182272 use MXE_XXXX tools for octave qt compiling (Bug 44563)
John Donoghue
parents: 3849
diff changeset
54 UIC=$(MXE_UIC) \
c55d9f182272 use MXE_XXXX tools for octave qt compiling (Bug 44563)
John Donoghue
parents: 3849
diff changeset
55 RCC=$(MXE_RCC) \
c55d9f182272 use MXE_XXXX tools for octave qt compiling (Bug 44563)
John Donoghue
parents: 3849
diff changeset
56 LRELEASE=$(MXE_LRELEASE)
3849
e50c777c9a97 explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands
John W. Eaton <jwe@octave.org>
parents: 3837
diff changeset
57
4233
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
58 ifeq ($(ENABLE_QT5),yes)
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
59 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
60 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
61 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
62 else
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
63 $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
64 $(PKG)_QTDIR := $(HOST_PREFIX)
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
65 endif
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
66
3497
ddaf87b79532 pass --disable-docs to Octave configure script unless ENABLE_DOCS == yes
John W. Eaton <jwe@octave.org>
parents: 3480
diff changeset
67 ifneq ($(ENABLE_DOCS),yes)
ddaf87b79532 pass --disable-docs to Octave configure script unless ENABLE_DOCS == yes
John W. Eaton <jwe@octave.org>
parents: 3480
diff changeset
68 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
3367
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
69 endif
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
70
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
71 ifeq ($(MXE_NATIVE_BUILD),yes)
3056
772aedf5f402 octave.mk: delete unnecessary quotes around LD_LIBRARY_PATH
John W. Eaton <jwe@octave.org>
parents: 3048
diff changeset
72 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
3015
ec6f91539788 initial support for --enable-64
John W. Eaton <jwe@octave.org>
parents: 3014
diff changeset
73 ifeq ($(ENABLE_64),yes)
4339
07671a76e291 qhull: enable qhull when compiling for 64bit (Bug #50069)
John D
parents: 4244
diff changeset
74 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8
3015
ec6f91539788 initial support for --enable-64
John W. Eaton <jwe@octave.org>
parents: 3014
diff changeset
75 endif
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
76 else
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
77 ifeq ($(MXE_SYSTEM),mingw)
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
78 $(PKG)_CROSS_CONFIG_OPTIONS := \
3031
951da75fd09c improve handling of cross tool prefix
John W. Eaton <jwe@octave.org>
parents: 3015
diff changeset
79 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
80 gl_cv_func_gettimeofday_clobber=no
3015
ec6f91539788 initial support for --enable-64
John W. Eaton <jwe@octave.org>
parents: 3014
diff changeset
81 ifeq ($(ENABLE_64),yes)
4339
07671a76e291 qhull: enable qhull when compiling for 64bit (Bug #50069)
John D
parents: 4244
diff changeset
82 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
3015
ec6f91539788 initial support for --enable-64
John W. Eaton <jwe@octave.org>
parents: 3014
diff changeset
83 endif
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
84 endif
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
85 endif
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
86
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
87 ifeq ($(MXE_SYSTEM),msvc)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
88 $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
89 # - Enable atomic refcount (required for QtHandles)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
90 # - Skip configure test for pow and sqrt, MSVC fails to compile them
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
91 # because it uses intrinsics (with -O2 flag) and bump on the fake
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
92 # "char FUNC()" forward declaration.
3327
5b38e99bbfe4 * src/octave.mk: Disable some warnings for MSVC build.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3323
diff changeset
93 # - Override CFLAGS and CXXFLAGS to disable some warnings.
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
94 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
95 --enable-atomic-refcount \
3327
5b38e99bbfe4 * src/octave.mk: Disable some warnings for MSVC build.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3323
diff changeset
96 ac_cv_func_pow=yes ac_cv_func_sqrt=yes \
5b38e99bbfe4 * src/octave.mk: Disable some warnings for MSVC build.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3323
diff changeset
97 CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \
5b38e99bbfe4 * src/octave.mk: Disable some warnings for MSVC build.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3323
diff changeset
98 CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
99 else
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
100 $(PKG)_PREFIX := '$(HOST_PREFIX)'
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
101 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
4233
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
102 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
103 endif
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
104
3646
f38e710f1d95 octave: add --no-x flag when compiling for mingw
John Donoghue <john.donoghue@ieee.org>
parents: 3643
diff changeset
105 ifeq ($(MXE_SYSTEM),mingw)
3647
fc67e3ab9324 fix typo to disable X
John Donoghue <john.donoghue@ieee.org>
parents: 3646
diff changeset
106 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
3646
f38e710f1d95 octave: add --no-x flag when compiling for mingw
John Donoghue <john.donoghue@ieee.org>
parents: 3643
diff changeset
107 endif
f38e710f1d95 octave: add --no-x flag when compiling for mingw
John Donoghue <john.donoghue@ieee.org>
parents: 3643
diff changeset
108
3968
d0d5dacd1941 octave: add msys2 patch
John Donoghue
parents: 3933
diff changeset
109 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
d0d5dacd1941 octave: add msys2 patch
John Donoghue
parents: 3933
diff changeset
110 $(PKG)_EXTRA_CONFIGURE_OPTIONS += ac_cv_search_tputs=-ltermcap
d0d5dacd1941 octave: add msys2 patch
John Donoghue
parents: 3933
diff changeset
111 endif
d0d5dacd1941 octave: add msys2 patch
John Donoghue
parents: 3933
diff changeset
112
3861
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
113 # if want binary packages and are cross compiling, then we need cross tools enabled
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
114 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
115 ifeq ($(MXE_NATIVE_BUILD),no)
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
116 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
117 endif
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
118 endif
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
119
2862
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
120 define $(PKG)_UPDATE
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
121 echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
3527
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
122 echo $($(PKG)_VERSION)
2862
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
123 endef
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
124
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
125 define $(PKG)_BUILD
3369
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
126 # jni install
3527
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
127 if [ "$(MXE_SYSTEM)" == "mingw" ] \
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
128 && [ "$(MXE_NATIVE_BUILD)" == "no" ] \
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
129 && [ "$(ENABLE_JAVA)" == "yes" ]; then \
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
130 if [ ! -f $(HOST_INCDIR)/java/jni.h ]; then \
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
131 mkdir -p '$(HOST_INCDIR)/java'; \
3516
3b5b776331f1 Only download java .h files if not already available
John Donoghue <john.donoghue@ieee.org>
parents: 3498
diff changeset
132 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
3527
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
133 -O $(HOST_INCDIR)/java/jni.h; \
3516
3b5b776331f1 Only download java .h files if not already available
John Donoghue <john.donoghue@ieee.org>
parents: 3498
diff changeset
134 fi; \
3527
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
135 if [ ! -f $(HOST_INCDIR)/java/win32/jni_md.h ]; then \
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
136 mkdir -p '$(HOST_INCDIR)/java/win32'; \
3516
3b5b776331f1 Only download java .h files if not already available
John Donoghue <john.donoghue@ieee.org>
parents: 3498
diff changeset
137 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
3527
b111822b0bf0 stable-octave.mk, octave.mk: Set java include dir, not home dir.
John W. Eaton <jwe@octave.org>
parents: 3516
diff changeset
138 -O $(HOST_INCDIR)/java/win32/jni_md.h; \
3516
3b5b776331f1 Only download java .h files if not already available
John Donoghue <john.donoghue@ieee.org>
parents: 3498
diff changeset
139 fi; \
3369
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
140 fi
a77a677643d5 Install and use jit header files in cross mingw build.
John Donoghue <john.donoghue@ieee.org>
parents: 3367
diff changeset
141
2874
890aa60f7b87 Temporary Octave patch file, improve Octave config and build.
John W. Eaton <jwe@octave.org>
parents: 2873
diff changeset
142 mkdir '$(1)/.build'
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2995
diff changeset
143 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
3223
94339f5a27fe octave.mk: also pass CONFIGURE_LDFLAGS to configure
John W. Eaton <jwe@octave.org>
parents: 3208
diff changeset
144 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
3013
bcc26ffe9a0f use variable for --host and --build configure arguments
John W. Eaton <jwe@octave.org>
parents: 3012
diff changeset
145 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
146 --prefix='$($(PKG)_PREFIX)' \
3807
c6dd0518f31b use --disable-silent-rules for Octave builds
John W. Eaton <jwe@octave.org>
parents: 3791
diff changeset
147 --disable-silent-rules \
3852
a781fda0a9c6 octave: enable install of build log (Bug #44575)
John Donoghue
parents: 3851
diff changeset
148 --enable-install-build-logs \
3323
808b2c61eccb octave.mk: Replace tabs with spaces for consistent alignment.
Rik <rik@octave.org>
parents: 3318
diff changeset
149 $($(PKG)_CROSS_CONFIG_OPTIONS) \
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
150 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
3333
4372645ff7e3 Add --disable-java option to configure.
Rik <rik@octave.org>
parents: 3327
diff changeset
151 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
152 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
3367
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
153 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
3849
e50c777c9a97 explicitly set MOC, UIC, RCC, and LRELEASE for Octave configure commands
John W. Eaton <jwe@octave.org>
parents: 3837
diff changeset
154 $($(PKG)_QT_CONFIGURE_OPTIONS) \
3323
808b2c61eccb octave.mk: Replace tabs with spaces for consistent alignment.
Rik <rik@octave.org>
parents: 3318
diff changeset
155 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
808b2c61eccb octave.mk: Replace tabs with spaces for consistent alignment.
Rik <rik@octave.org>
parents: 3318
diff changeset
156 PKG_CONFIG='$(MXE_PKG_CONFIG)' \
4233
353adab0f253 octave: set qt5 configure options if ENABLE_QT5 used
John D
parents: 4220
diff changeset
157 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
3341
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3334
diff changeset
158 && $(CONFIGURE_POST_HOOK)
2874
890aa60f7b87 Temporary Octave patch file, improve Octave config and build.
John W. Eaton <jwe@octave.org>
parents: 2873
diff changeset
159
2936
fc124629c527 backout changeset 0adbff7dec24
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
160 ## We want both of these install steps so that we install in the
fc124629c527 backout changeset 0adbff7dec24
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
161 ## location set by the configure --prefix option, and the other
fc124629c527 backout changeset 0adbff7dec24
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
162 ## in a directory tree that will have just Octave files.
3318
2640cb06f42d * src/octave.mk: Support file list by using DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3315
diff changeset
163 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
3367
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
164
3423
c8e055d83b9f Set start directory to user home (Bug #41220)
John D <john.donoghue@ieee.org>
parents: 3417
diff changeset
165 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
c8e055d83b9f Set start directory to user home (Bug #41220)
John D <john.donoghue@ieee.org>
parents: 3417
diff changeset
166 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
3861
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
167 if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
168 mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
169 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
170 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
dbc4b45a0f06 octave.mk: handle cross compiling packages
John W. Eaton <jwe@octave.org>
parents: 3856
diff changeset
171 fi; \
3423
c8e055d83b9f Set start directory to user home (Bug #41220)
John D <john.donoghue@ieee.org>
parents: 3417
diff changeset
172 fi
c8e055d83b9f Set start directory to user home (Bug #41220)
John D <john.donoghue@ieee.org>
parents: 3417
diff changeset
173
3367
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
174 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
175 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
176 fi
cfcbe03c9160 installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents: 3346
diff changeset
177
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
178 if [ $(MXE_SYSTEM) != msvc ]; then \
4066
0962acdde3be builld: allow out of source build
John Donoghue
parents: 4065
diff changeset
179 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3069
diff changeset
180 fi
3383
6dfbea9a9646 Update stable-octave to 3.8.0
John Donoghue <john.donoghue@ieee.org>
parents: 3371
diff changeset
181
6dfbea9a9646 Update stable-octave to 3.8.0
John Donoghue <john.donoghue@ieee.org>
parents: 3371
diff changeset
182 # create a file with latest installed octave rev in it
4066
0962acdde3be builld: allow out of source build
John Donoghue
parents: 4065
diff changeset
183 echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
2862
e93d77b61f17 Include support for building Octave.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
184 endef