diff src/python-mpmath.mk @ 5493:dace3d372190

Use msys2 python3 * src/msys2-mpdecimal.mk, src/msys2-python.mk, src/src-msys2-mpdecimal.mk, src/src-msys2-python.mk: new files * dist-files.mk: added ref to new files * index.html: add ref to new packages * installer-files/octave-firsttime.vbs, installer-files/octave.bat, installer-files/octave.vbs: remove python path add * src/python-embedded.mk: add note on not used * src/python-mpmath.mk, src/python-sympy.mk: update dependancy for msys2-python
author John Donoghue <john.donoghue@ieee.org>
date Thu, 23 Jul 2020 12:29:32 -0400
parents 47b1ea174cb0
children c3ad8279a506
line wrap: on
line diff
--- a/src/python-mpmath.mk	Thu Jul 23 07:17:24 2020 -0400
+++ b/src/python-mpmath.mk	Thu Jul 23 12:29:32 2020 -0400
@@ -7,14 +7,21 @@
 $(PKG)_SUBDIR   := 
 $(PKG)_FILE     := mpmath-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://files.pythonhosted.org/packages/ca/63/3384ebb3b51af9610086b23ea976e6d27d6d97bf140a76a365bd77a3eb32/$($(PKG)_FILE)
-$(PKG)_DEPS += python-embedded
+$(PKG)_DEPS     :=
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+ $(PKG)_DEPS += msys2-python
+ $(PKG)_PYTHON_PKG_DIR := $(MSYS2_DIR)/usr/lib/python$(call SHORT_PKG_VERSION,msys2-python)/site-packages/
+else
+ $(PKG)_PYTHON_PKG_DIR := $(3)$(HOST_PREFIX)/python
+endif
 
 define $(PKG)_UPDATE
     echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(3)$(HOST_PREFIX)/python'
-    cd '$(1)/mpmath-$($(PKG)_VERSION)' && tar cf - mpmath | ( cd '$(3)$(HOST_PREFIX)/python'; tar xpf - )
-    cd '$(1)' && tar cf - --exclude=mpmath-$($(PKG)_VERSION)/mpmath . | ( cd '$(3)$(HOST_PREFIX)/python'; tar xpf - )
+    mkdir -p '$($(PKG)_PYTHON_PKG_DIR)'
+    cd '$(1)/mpmath-$($(PKG)_VERSION)' && tar cf - mpmath | ( cd '$($(PKG)_PYTHON_PKG_DIR)'; tar xpf - )
+    cd '$(1)' && tar cf - --exclude=mpmath-$($(PKG)_VERSION)/mpmath . | ( cd '$($(PKG)_PYTHON_PKG_DIR)'; tar xpf - )
 endef