Mercurial > mxe-octave

comparison src/default-octave.mk @ 3854:85568f3159a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
binary-packages: update for cross tools * Makefile.in: add MXE_OCTAVECONFIG and use for of-pkg building * dist-files.mk: add of-fits-1-cross-fixes.patch, of-sockets-1-cross-fixes.patch * src/default-octave.mk: use --enable-cross-tools not --enable-cross-mkoctfile and install octave-config * src/of-fits-1-cross-fixes.patch: new file * src/of-fits.mk: enable package compile * src/of-fl-core-1-fixes.patch: new file * src/of-fl-core.mk: enable pkg conpile * src/of-sockets-1-cross-fixes.patch: new file * src/of-sockets.mk: enable pkg conpile
author John Donoghue
date Fri, 20 Mar 2015 14:39:17 -0400
parents 58935b4de51f
children df05a7fe64b3
comparison
equal deleted inserted replaced
3853:58935b4de51f 3854:85568f3159a4
89 89
90 ifeq ($(MXE_SYSTEM),mingw) 90 ifeq ($(MXE_SYSTEM),mingw)
91 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no 91 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
92 endif 92 endif
93 93
94 # if want binary packages and are cross compiling, then we need cross mkoctfile 94 # if want binary packages and are cross compiling, then we need cross tools enabled
95 ifeq ($(ENABLE_BINARY_PACKAGES),yes) 95 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
96 ifeq ($(MXE_NATIVE_BUILD),no) 96 ifeq ($(MXE_NATIVE_BUILD),no)
97 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-mkoctfile 97 $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools
98 endif 98 endif
99 endif 99 endif
100 100
101 define $(PKG)_UPDATE 101 define $(PKG)_UPDATE
102 echo 'Warning: Updates are temporarily disabled for package octave.' >&2; 102 echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
143 ## in a directory tree that will have just Octave files. 143 ## in a directory tree that will have just Octave files.
144 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' 144 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
145 145
146 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ 146 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
147 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ 147 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
148 mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ 148 if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
149 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ 149 mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
150 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
151 $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
152 fi; \
150 fi 153 fi
151 154
152 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \ 155 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
153 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \ 156 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
154 fi 157 fi