Mercurial > mxe-octave
diff Makefile.in @ 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 | 9ceedf18871e |
line wrap: on
line diff
--- a/Makefile.in Thu Mar 19 14:03:28 2015 -0400 +++ b/Makefile.in Fri Mar 20 14:39:17 2015 -0400 @@ -315,6 +315,7 @@ MXE_RCC := $(HOST_BINDIR)/rcc MXE_MKOCTFILE := $(HOST_BINDIR)/mkoctfile + MXE_OCTAVECONFIG := $(HOST_BINDIR)/octave-config else MXE_TOOL_PREFIX := $(TARGET)- MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' @@ -339,6 +340,7 @@ MXE_RCC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' MXE_MKOCTFILE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)mkoctfile' + MXE_OCTAVECONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)octave-config' endif ifeq ($(MXE_SYSTEM),mingw) @@ -590,11 +592,13 @@ if [ -d '$(1)/src' ]; then \ if [ -f '$(1)/src/configure' ]; then \ cd '$(1)/src' && ./configure $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) MKOCTFILE='$(MXE_MKOCTFILE)'\ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) MKOCTFILE='$(MXE_MKOCTFILE)' \ + OCTAVECONFIG='$(MXE_OCTAVECONFIG)' \ $(4); \ fi; \ if [ -f '$(1)/src/Makefile' ]; then \ - $(MAKE) -C '$(1)/src' MKOCTFILE='$(MXE_MKOCTFILE) --verbose'; \ + $(MAKE) -C '$(1)/src' MKOCTFILE='$(MXE_MKOCTFILE) --verbose' \ + OCTAVECONFIG='$(MXE_OCTAVECONFIG)'; \ fi; \ fi endef