From 8e40d1140f38c6b18cf90af64509502f5d57e88a Mon Sep 17 00:00:00 2001 From: bluezr Date: Sun, 16 Oct 2022 15:42:56 -0700 Subject: [PATCH 1/2] depends: use python3 in native_biplist/ds_store/mac_alias.mk -instead of using python-is-python3 update native_biplist.mk, native_ds_store.mk and native_mac_alias.mk files to use python3 --- depends/packages/native_biplist.mk | 4 ++-- depends/packages/native_ds_store.mk | 4 ++-- depends/packages/native_mac_alias.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/depends/packages/native_biplist.mk b/depends/packages/native_biplist.mk index 3c6e8900f..373490aed 100644 --- a/depends/packages/native_biplist.mk +++ b/depends/packages/native_biplist.mk @@ -11,10 +11,10 @@ define $(package)_preprocess_cmds endef define $(package)_build_cmds - python setup.py build + python3 setup.py build endef define $(package)_stage_cmds mkdir -p $($(package)_install_libdir) && \ - python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) + python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) endef diff --git a/depends/packages/native_ds_store.mk b/depends/packages/native_ds_store.mk index 1053a0cd3..671c68bbc 100644 --- a/depends/packages/native_ds_store.mk +++ b/depends/packages/native_ds_store.mk @@ -7,10 +7,10 @@ $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages $(package)_dependencies=native_biplist define $(package)_build_cmds - python setup.py build + python3 setup.py build endef define $(package)_stage_cmds mkdir -p $($(package)_install_libdir) && \ - python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) + python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) endef diff --git a/depends/packages/native_mac_alias.mk b/depends/packages/native_mac_alias.mk index 8dc283143..3b0e6852a 100644 --- a/depends/packages/native_mac_alias.mk +++ b/depends/packages/native_mac_alias.mk @@ -12,10 +12,10 @@ define $(package)_preprocess_cmds endef define $(package)_build_cmds - python setup.py build + python3 setup.py build endef define $(package)_stage_cmds mkdir -p $($(package)_install_libdir) && \ - python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) + python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) endef From db5336148b20b7f0c36b01cd21eec9d4dad7180c Mon Sep 17 00:00:00 2001 From: Dakoda Greaves Date: Sun, 16 Oct 2022 19:41:03 -0700 Subject: [PATCH 2/2] gitian: change python to python3 in osx descriptor --- contrib/gitian-descriptors/gitian-osx.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index f3b0346c5..31259de25 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -23,9 +23,9 @@ packages: - "libcap-dev" - "libz-dev" - "libbz2-dev" -- "python" -- "python-dev" -- "python-setuptools" +- "python3" +- "python3-dev" +- "python3-setuptools" - "fonts-tuffy" remotes: - "url": "https://github.com/dogecoin/dogecoin.git"