Mercurial > mxe-octave

comparison src/default-octave.mk @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents 1cac12604314
children 2b9f1923dc21
comparison
equal deleted inserted replaced
4221:1cac12604314 4222:44b1a9b2193e
12 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz 12 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz
13 $(PKG)_URL := http://hydra.nixos.org/job/gnu/octave-default/tarball/latest/download 13 $(PKG)_URL := http://hydra.nixos.org/job/gnu/octave-default/tarball/latest/download
14 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 14 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
15 $(PKG)_FONTCONFIG := fontconfig 15 $(PKG)_FONTCONFIG := fontconfig
16 endif 16 endif
17 $(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 17 $(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
18
19 ifeq ($(ENABLE_QT5),yes)
20 $(PKG)_DEPS += qt5
21 else
22 $(PKG)_DEPS += qt
23 endif
24
18 ifeq ($(MXE_WINDOWS_BUILD),no) 25 ifeq ($(MXE_WINDOWS_BUILD),no)
19 ifeq ($(USE_SYSTEM_X11_LIBS),no) 26 ifeq ($(USE_SYSTEM_X11_LIBS),no)
20 $(PKG)_DEPS += x11 xext 27 $(PKG)_DEPS += x11 xext
21 endif 28 endif
22 endif 29 endif
54 MOC=$(MXE_MOC) \ 61 MOC=$(MXE_MOC) \
55 UIC=$(MXE_UIC) \ 62 UIC=$(MXE_UIC) \
56 RCC=$(MXE_RCC) \ 63 RCC=$(MXE_RCC) \
57 LRELEASE=$(MXE_LRELEASE) 64 LRELEASE=$(MXE_LRELEASE)
58 65
66 ifeq ($(ENABLE_QT5),yes)
67 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
68 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
69 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5
70 else
71 $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
72 $(PKG)_QTDIR := $(HOST_PREFIX)
73 endif
74
75
59 ifneq ($(ENABLE_DOCS),yes) 76 ifneq ($(ENABLE_DOCS),yes)
60 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs 77 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
61 endif 78 endif
62 79
63 ifeq ($(MXE_NATIVE_BUILD),yes) 80 ifeq ($(MXE_NATIVE_BUILD),yes)
89 CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \ 106 CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \
90 CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' 107 CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
91 else 108 else
92 $(PKG)_PREFIX := '$(HOST_PREFIX)' 109 $(PKG)_PREFIX := '$(HOST_PREFIX)'
93 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ 110 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
94 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' 111 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
95 endif 112 endif
96 113
97 ifeq ($(MXE_SYSTEM),mingw) 114 ifeq ($(MXE_SYSTEM),mingw)
98 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no 115 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
99 endif 116 endif
144 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ 161 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
145 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ 162 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
146 $($(PKG)_QT_CONFIGURE_OPTIONS) \ 163 $($(PKG)_QT_CONFIGURE_OPTIONS) \
147 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ 164 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
148 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 165 PKG_CONFIG='$(MXE_PKG_CONFIG)' \
149 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ 166 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
150 && $(CONFIGURE_POST_HOOK) 167 && $(CONFIGURE_POST_HOOK)
151 168
152 $(MAKE) -C '$(1)/.build/libgnu' 169 $(MAKE) -C '$(1)/.build/libgnu'
153 170
154 ## We want both of these install steps so that we install in the 171 ## We want both of these install steps so that we install in the