Mercurial > mxe-octave

comparison src/stable-octave.mk @ 4245:e622765c49c7 octave-release-4.2.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update stable-octave package for 4.2.0 release. * src/stable-octave.mk: Update for 4.2.0 release. * src/stable-octave-1-gnulib.patch: New file. * src/stable-octave-1-docinstall.patch: Delete. * src/stable-octave-1-fixes.patch: Delete. * src/of-io-1-fixes.patch: New file.
author John W. Eaton <jwe@octave.org>
date Sun, 13 Nov 2016 12:47:40 -0500
parents 094981f6f787
children 07671a76e291
comparison
equal deleted inserted replaced
4244:0e35d2f6fc6a 4245:e622765c49c7
1 # This file is part of MXE. 1 # This file is part of MXE.
2 # See index.html for further information. 2 # See index.html for further information.
3 3
4 PKG := stable-octave 4 PKG := stable-octave
5 $(PKG)_IGNORE := 5 $(PKG)_IGNORE :=
6 $(PKG)_VERSION := 4.0.3 6 $(PKG)_VERSION := 4.2.0
7 $(PKG)_CHECKSUM := c798346a8271e0141d9dbe5610584dabb8311277 7 $(PKG)_CHECKSUM := de2977e8b242cb655ec326b8f7718d43a15135a9
8 $(PKG)_SUBDIR := octave-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := octave-$($(PKG)_VERSION)
9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.xz 9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz
10 $(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE) 10 $(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
11 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
12 $(PKG)_FONTCONFIG := fontconfig 12 $(PKG)_FONTCONFIG := fontconfig
13 endif 13 endif
14 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib 14 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla readline suitesparse texinfo zlib
15
16 ifeq ($(ENABLE_QT5),yes)
17 $(PKG)_DEPS += qt5
18 else
19 $(PKG)_DEPS += qt
20 endif
21
15 ifeq ($(MXE_WINDOWS_BUILD),no) 22 ifeq ($(MXE_WINDOWS_BUILD),no)
16 ifeq ($(USE_SYSTEM_X11_LIBS),no) 23 ifeq ($(USE_SYSTEM_X11_LIBS),no)
17 $(PKG)_DEPS += x11 xext 24 $(PKG)_DEPS += x11 xext
18 endif 25 endif
19 endif 26 endif
49 MOC=$(MXE_MOC) \ 56 MOC=$(MXE_MOC) \
50 UIC=$(MXE_UIC) \ 57 UIC=$(MXE_UIC) \
51 RCC=$(MXE_RCC) \ 58 RCC=$(MXE_RCC) \
52 LRELEASE=$(MXE_LRELEASE) 59 LRELEASE=$(MXE_LRELEASE)
53 60
61 ifeq ($(ENABLE_QT5),yes)
62 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
63 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
64 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5
65 else
66 $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
67 $(PKG)_QTDIR := $(HOST_PREFIX)
68 endif
69
54 ifneq ($(ENABLE_DOCS),yes) 70 ifneq ($(ENABLE_DOCS),yes)
55 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs 71 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
56 endif 72 endif
57 73
58 ifeq ($(MXE_NATIVE_BUILD),yes) 74 ifeq ($(MXE_NATIVE_BUILD),yes)
84 CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \ 100 CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \
85 CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' 101 CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
86 else 102 else
87 $(PKG)_PREFIX := '$(HOST_PREFIX)' 103 $(PKG)_PREFIX := '$(HOST_PREFIX)'
88 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ 104 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
89 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' 105 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
90 endif 106 endif
91 107
92 ifeq ($(MXE_SYSTEM),mingw) 108 ifeq ($(MXE_SYSTEM),mingw)
93 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no 109 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
110 endif
111
112 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
113 $(PKG)_EXTRA_CONFIGURE_OPTIONS += ac_cv_search_tputs=-ltermcap
94 endif 114 endif
95 115
96 # if want binary packages and are cross compiling, then we need cross tools enabled 116 # if want binary packages and are cross compiling, then we need cross tools enabled
97 ifeq ($(ENABLE_BINARY_PACKAGES),yes) 117 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
98 ifeq ($(MXE_NATIVE_BUILD),no) 118 ifeq ($(MXE_NATIVE_BUILD),no)
135 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ 155 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
136 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ 156 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
137 $($(PKG)_QT_CONFIGURE_OPTIONS) \ 157 $($(PKG)_QT_CONFIGURE_OPTIONS) \
138 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ 158 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
139 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 159 PKG_CONFIG='$(MXE_PKG_CONFIG)' \
140 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ 160 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
141 && $(CONFIGURE_POST_HOOK) 161 && $(CONFIGURE_POST_HOOK)
142 162
143 ## We want both of these install steps so that we install in the 163 ## We want both of these install steps so that we install in the
144 ## location set by the configure --prefix option, and the other 164 ## location set by the configure --prefix option, and the other
145 ## in a directory tree that will have just Octave files. 165 ## in a directory tree that will have just Octave files.