Corrected some dependencies in the NumPy build targets.

Author: freakboy3742

Makefile

@@ -191,6 +191,12 @@ XZ_DIR-$1=build/$2/xz-$(XZ_VERSION)-$1
 PYTHON_DIR-$1=build/$2/Python-$(PYTHON_VERSION)-$1
 pyconfig.h-$1=pyconfig-$$(ARCH-$1).h
 
+ifeq ($2,macOS)
+PYTHON_HOST_DEP-$1=
+else
+PYTHON_HOST-$1=$(PYTHON_HOST)
+endif
+
 # Unpack OpenSSL
 $$(OPENSSL_DIR-$1)/Makefile: downloads/openssl-$(OPENSSL_VERSION).tgz
 	# Unpack sources
@@ -265,7 +271,7 @@ $$(XZ_DIR-$1)/src/liblzma/.libs/liblzma.a: $$(XZ_DIR-$1)/Makefile
 	cd $$(XZ_DIR-$1) && make && make install
 
 # Unpack Python
-$$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz $(PYTHON_HOST)
+$$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz $$(PYTHON_HOST-$1)
 	# Unpack target Python
 	mkdir -p $$(PYTHON_DIR-$1)
 	tar zxf downloads/Python-$(PYTHON_VERSION).tgz --strip-components 1 -C $$(PYTHON_DIR-$1)
@@ -412,7 +418,7 @@ build/$1/xz/lib/liblzma.a: $$(foreach target,$$(TARGETS-$1),$$(XZ_DIR-$$(target)
 
 $1: Python-$1
 
-Python-$1: $$(PYTHON_FRAMEWORK-$1)
+Python-$1: dist/Python-$(PYTHON_VER)-$1-support.b$(BUILD_NUMBER).tar.gz
 
 # Build Python
 $$(PYTHON_FRAMEWORK-$1): build/$1/libpython$(PYTHON_VER)m.a $$(foreach target,$$(TARGETS-$1),build/$1/$$(pyconfig.h-$$(target)))
@@ -467,7 +473,7 @@ pip: Python-macOS
 	$(HOST_PYTHON) -m ensurepip
 
 # Create the directory that will contain installed packages
-dist/app_packages: pip
+dist/app_packages:
 	mkdir -p dist/app_packages
 
 # Makefiles for individual binary packages that are supported.

patch/numpy/Makefile.numpy

@@ -36,7 +36,7 @@ endef
 define build-numpy
 $$(foreach target,$$(TARGETS-$1),$$(eval $$(call build-numpy-target,$$(target),$1)))
 
-build/$1/packages/numpy: downloads/numpy-$(NUMPY_VERSION).tgz
+build/$1/packages/numpy: pip downloads/numpy-$(NUMPY_VERSION).tgz
 	# Unpack numpy sources
 	mkdir -p build/$1/packages/numpy
 	tar zxf downloads/numpy-$(NUMPY_VERSION).tgz --strip-components 1 -C build/$1/packages/numpy
@@ -50,12 +50,12 @@ ifeq ($1,macOS)
 # Just install the source as-is into the dist/app_packages directory
 # Then clean out all the binary artefacts
 
-dist/app_packages/numpy: dist/app_packages build/$1/packages/numpy
-	cd build/$1/packages/numpy && \
+dist/app_packages/numpy: pip dist/app_packages build/macOS/packages/numpy
+	cd build/macOS/packages/numpy && \
 		$(NUMPY_CONFIG) $(HOST_PIP) install --target $(PROJECT_DIR)/dist/app_packages .
-	find build/$1/packages/numpy -name "*.so" -exec rm {} \;
+	find build/macOS/packages/numpy -name "*.so" -exec rm {} \;
 
-numpy-$1: dist/app_packages/numpy
+numpy-macOS: dist/app_packages/numpy
 
 else
 # For all other platforms, run the numpy build for each target architecture
@@ -75,4 +75,4 @@ endef
 $(foreach os,$(OS),$(eval $(call build-numpy,$(os))))
 
 # Main entry point
-numpy: pip $(foreach os,$(OS),numpy-$(os))
+numpy: $(foreach os,$(OS),numpy-$(os))