Mercurial > mxe-octave

comparison src/stable-octave.mk @ 4749:ad711297712a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stable-octave.mk: handle libxerbla
author John W. Eaton <jwe@octave.org>
date Fri, 29 Jun 2018 10:41:56 -0400
parents a6b4355efbd6
children e839056b9a65
comparison
equal deleted inserted replaced
4748:a6b4355efbd6 4749:ad711297712a
27 $(PKG)_DEPS += qt5 27 $(PKG)_DEPS += qt5
28 else 28 else
29 $(PKG)_DEPS += qt 29 $(PKG)_DEPS += qt
30 endif 30 endif
31 31
32 ifeq ($(MXE_WINDOWS_BUILD),no) 32 ifeq ($(MXE_WINDOWS_BUILD),yes)
33 $(PKG)_WITH_BLAS_CONFIGURE_OPTIONS := --with-blas="-lblas -lxerbla"
34 else
33 ifeq ($(USE_SYSTEM_X11_LIBS),no) 35 ifeq ($(USE_SYSTEM_X11_LIBS),no)
34 $(PKG)_DEPS += x11 xext 36 $(PKG)_DEPS += x11 xext
35 endif 37 endif
36 endif 38 endif
37 39
171 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ 173 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
172 --prefix='$($(PKG)_PREFIX)' \ 174 --prefix='$($(PKG)_PREFIX)' \
173 --disable-silent-rules \ 175 --disable-silent-rules \
174 --enable-install-build-logs \ 176 --enable-install-build-logs \
175 $($(PKG)_CROSS_CONFIG_OPTIONS) \ 177 $($(PKG)_CROSS_CONFIG_OPTIONS) \
178 $($(PKG)_WITH_BLAS_CONFIGURE_OPTIONS) \
176 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ 179 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
177 $($(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS) \ 180 $($(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS) \
178 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ 181 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
179 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ 182 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
180 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ 183 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
190 ## location set by the configure --prefix option, and the other 193 ## location set by the configure --prefix option, and the other
191 ## in a directory tree that will have just Octave files. 194 ## in a directory tree that will have just Octave files.
192 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' 195 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
193 196
194 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ 197 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
198 $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \
195 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ 199 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
196 if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ 200 if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
197 mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ 201 mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
198 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ 202 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
199 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ 203 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \