Index: 3pp/app/python3/3.12.6/Makefile
===================================================================
--- 3pp/app/python3/3.12.6/Makefile (revision 48)
+++ 3pp/app/python3/3.12.6/Makefile (revision 49)
@@ -36,7 +36,7 @@
extra_configure_switches += --with-system-expat
extra_configure_switches += --with-system-ffi
extra_configure_switches += --with-threads
-extra_configure_switches += --without-ensurepip
+extra_configure_switches += --with-ensurepip=no
extra_configure_switches += --enable-ipv6
extra_configure_switches += --enable-shared
@@ -48,7 +48,7 @@
$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
$(UNPACK_SRC_ARCHIVE)
$(APPLY_PATCHES)
- @cd $(SRC_DIR) && sed -i 's|\("install",\)|\1 "--ignore-installed",|' Lib/ensurepip/__init__.py
+ @cd $(SRC_DIR) && sed -i '1s|^#.*/usr/local/bin/python|#!/usr/bin/python3|' Lib/cgi.py
@touch $@
$(build_target): $(src_done)
@@ -64,6 +64,8 @@
$(install_target): $(build_target)
@echo -e "\n======= Installing Python 3.12 binary =======\n"
@cd $(SRC_DIR) && $(MAKE) -j1 $(python_environment) install
+ @echo -e "\n======= Installing PiP 3.12 from Python sources =======\n"
+ @cd $(SRC_DIR) && ./python -E -m ensurepip --root=/
@( cd $(BUILDSYSTEM)/usr/bin ; \
ln -sf 2to3-2.7 2to3 ; \
)
Index: 3pp/app/python3-modules/pip/24.2/Makefile
===================================================================
--- 3pp/app/python3-modules/pip/24.2/Makefile (revision 48)
+++ 3pp/app/python3-modules/pip/24.2/Makefile (revision 49)
@@ -34,8 +34,6 @@
$(build_target): $(src_done)
@( cd $(SRC_DIR) ; \
- $(BUILDSYSTEM)/usr/bin/python3 setup.py egg_info ; \
- $(BUILDSYSTEM)/usr/bin/python3 setup.py build ; \
)
@touch $@
@@ -42,7 +40,7 @@
$(install_target): $(build_target)
@echo -e "\n======= Installing setuptools-$(version) =======\n"
@( cd $(SRC_DIR) ; \
- $(BUILDSYSTEM)/usr/bin/python3 setup.py install --root=/ ; \
+ $(BUILDSYSTEM)/usr/bin/python3 -m pip install --upgrade --root=/ . ; \
)
@echo -e "\n======= Install Python3 wheel, PLY, pygments, cryptography packages =======\n"
@( cd $(BUILDSYSTEM)/usr/bin ; \