Mercurial > mxe-octave

comparison src/octave.mk @ 3861:dbc4b45a0f06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave.mk: handle cross compiling packages
author John W. Eaton <jwe@octave.org>
date Tue, 24 Mar 2015 12:43:39 -0400
parents 7ee9c478ce02
children 588d2942b538
comparison
equal deleted inserted replaced
3860:b36a7ab4bd2c 3861:dbc4b45a0f06
86 86
87 ifeq ($(MXE_SYSTEM),mingw) 87 ifeq ($(MXE_SYSTEM),mingw)
88 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no 88 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
89 endif 89 endif
90 90
91 # if want binary packages and are cross compiling, then we need cross tools enabled
92 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
93 ifeq ($(MXE_NATIVE_BUILD),no)
94 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools
95 endif
96 endif
97
91 define $(PKG)_UPDATE 98 define $(PKG)_UPDATE
92 echo 'Warning: Updates are temporarily disabled for package octave.' >&2; 99 echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
93 echo $($(PKG)_VERSION) 100 echo $($(PKG)_VERSION)
94 endef 101 endef
95 102
133 ## in a directory tree that will have just Octave files. 140 ## in a directory tree that will have just Octave files.
134 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' 141 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
135 142
136 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ 143 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
137 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ 144 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
145 if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
146 mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
147 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
148 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
149 fi; \
138 fi 150 fi
139 151
140 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \ 152 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
141 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \ 153 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
142 fi 154 fi