Mercurial > mxe-octave
changeset 3610:566fd51378f2
Use system python in native mingw
* Makefile.in: if native mingw build, add python requirement and dont build build-python.
* src/build-scons.mk: in native mingw, do not have dependancy on build-python.
author | John Donoghue |
---|---|
date | Mon, 09 Jun 2014 08:00:17 -0400 |
parents | 360eff7d9c06 |
children | 5ab3fc53d7a5 |
files | Makefile.in src/build-scons.mk |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Jun 09 08:11:22 2014 -0400 +++ b/Makefile.in Mon Jun 09 08:00:17 2014 -0400 @@ -203,6 +203,11 @@ REQUIREMENTS += makeinfo xz BUILD_TOOLS := $(filter-out build-texinfo build-xz, $(BUILD_TOOLS)) endif +# use the a native python in native mingw +ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) + REQUIREMENTS += python + BUILD_TOOLS := $(filter-out build-python, $(BUILD_TOOLS)) +endif ifeq ($(USE_SYSTEM_GCC),yes)
--- a/src/build-scons.mk Mon Jun 09 08:11:22 2014 -0400 +++ b/src/build-scons.mk Mon Jun 09 08:00:17 2014 -0400 @@ -8,7 +8,11 @@ $(PKG)_SUBDIR := scons-$($(PKG)_VERSION) $(PKG)_FILE := scons-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://prdownloads.sourceforge.net/scons/$($(PKG)_FILE) -$(PKG)_DEPS := build-python +ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) + $(PKG)_DEPS := +else + $(PKG)_DEPS := build-python +endif define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;