]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
fix building python3
authorMarkham <markham001@gmx.de>
Sat, 13 Jul 2024 18:11:24 +0000 (20:11 +0200)
committerMarkham <markham001@gmx.de>
Sat, 13 Jul 2024 18:11:24 +0000 (20:11 +0200)
make/python3.mk

index ce5ec32a248786b8c4cea0cc87b01fe023e587ed..a3d99b8c5a6dc226cac6813251c92e4c46581351 100644 (file)
@@ -84,6 +84,7 @@ $(D)/python3: $(D)/host_python3 $(D)/libffi $(D)/expat $(ARCHIVE)/Python-$(PYTHO
 # ------------------------------- HOST PYTHON3------------------------------
 
 HOST_PYTHON3_MAKE_OPTS = \
+       CFLAGS="$(HOST_CFLAGS)" \
        LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags"
 
 # Make python believe we don't have 'hg', so that it doesn't try to
@@ -96,7 +97,7 @@ HOST_PYTHON3_CONF_OPTS += \
        --without-ensurepip \
        --without-cxx-main \
        --with-expat=system \
-       --enable-openssl \
+       --with-openssl=$(HOSTPREFIX)/usr \
        --enable-unicodedata \
        --disable-bzip2 \
        --disable-codecs-cjk \
@@ -109,7 +110,7 @@ HOST_PYTHON3_CONF_OPTS += \
        --disable-tk \
        --disable-uuid
        
-$(D)/host_python3: $(D)/host_zlib $(D)/host_libffi $(D)/host_expat $(ARCHIVE)/Python-$(PYTHON3_VER).tar.xz | $(HOSTPREFIX)
+$(D)/host_python3: $(D)/host_zlib $(D)/host_libffi $(D)/host_expat $(D)/host_openssl $(ARCHIVE)/Python-$(PYTHON3_VER).tar.xz | $(HOSTPREFIX)
        $(START_BUILD)
        $(REMOVE)/Python-$(PYTHON3_VER)
        $(UNTAR)/Python-$(PYTHON3_VER).tar.xz
@@ -191,7 +192,11 @@ $(ARCHIVE)/get-pip.py:
 $(D)/host_python3_pip: $(ARCHIVE)/get-pip.py $(D)/host_python3 | $(TARGETPEFIX)
        $(START_BUILD)
        @echo "Installing lastest pip."
-       $(HOSTPREFIX)/usr/bin/python3 $(ARCHIVE)/get-pip.py
+       @set -e; \
+       if ! $(HOSTPREFIX)/usr/bin/python3 $(ARCHIVE)/get-pip.py; then \
+               echo "Failed to install pip."; \
+               exit 1; \
+       fi
        $(TOUCH)
 
 MY_PY_PACKAGES = $(BUILD_TMP)/my_py_packages