Mercurial > mxe-octave

comparison src/octave.mk @ 4233:353adab0f253

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave: set qt5 configure options if ENABLE_QT5 used * src/octave.mk: add qt5 to pkg config and lib path if ENABLE_QT5 = yes
author John D
date Thu, 13 Oct 2016 08:00:44 -0400
parents 7c07a8b0eaf0
children 1cb1ce8f351c
comparison
equal deleted inserted replaced
4232:447859733feb 4233:353adab0f253
9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.xz 9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.xz
10 $(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE) 10 $(PKG)_URL := ftp://alpha.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
94 endif 110 endif
139 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ 155 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
140 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ 156 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
141 $($(PKG)_QT_CONFIGURE_OPTIONS) \ 157 $($(PKG)_QT_CONFIGURE_OPTIONS) \
142 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ 158 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
143 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 159 PKG_CONFIG='$(MXE_PKG_CONFIG)' \
144 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ 160 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
145 && $(CONFIGURE_POST_HOOK) 161 && $(CONFIGURE_POST_HOOK)
146 162
147 ## 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
148 ## location set by the configure --prefix option, and the other 164 ## location set by the configure --prefix option, and the other
149 ## in a directory tree that will have just Octave files. 165 ## in a directory tree that will have just Octave files.