Mercurial > mxe-octave
diff src/default-octave.mk @ 3854:85568f3159a4
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 |
line wrap: on
line diff
--- a/src/default-octave.mk Thu Mar 19 14:03:28 2015 -0400 +++ b/src/default-octave.mk Fri Mar 20 14:39:17 2015 -0400 @@ -91,10 +91,10 @@ $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no endif -# if want binary packages and are cross compiling, then we need cross mkoctfile +# if want binary packages and are cross compiling, then we need cross tools enabled ifeq ($(ENABLE_BINARY_PACKAGES),yes) ifeq ($(MXE_NATIVE_BUILD),no) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-mkoctfile + $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools endif endif @@ -145,8 +145,11 @@ if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ - mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ - $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ + if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ + mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ + $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ + $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ + fi; \ fi if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \