From 516717ba9ec2a76d1d0cff60add17c6cabac33eb Mon Sep 17 00:00:00 2001 From: fdov Date: Sun, 28 Nov 2021 15:26:29 +0100 Subject: [PATCH 1/2] depends: python to python3 --- depends/config.site.in | 2 +- depends/packages/native_biplist.mk | 6 +++--- depends/packages/native_mac_alias.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/depends/config.site.in b/depends/config.site.in index 72843e2db1..8362a02d51 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -79,7 +79,7 @@ CC="@CC@" CXX="@CXX@" OBJC="${CC}" CCACHE=$depends_prefix/native/bin/ccache -PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH +PYTHONPATH=$depends_prefix/native/lib/python3/dist-packages:$PYTHONPATH if test -n "@AR@"; then AR=@AR@ diff --git a/depends/packages/native_biplist.mk b/depends/packages/native_biplist.mk index 3c6e8900f6..819ed27d36 100644 --- a/depends/packages/native_biplist.mk +++ b/depends/packages/native_biplist.mk @@ -3,7 +3,7 @@ $(package)_version=0.9 $(package)_download_path=https://pypi.python.org/packages/source/b/biplist $(package)_file_name=biplist-$($(package)_version).tar.gz $(package)_sha256_hash=b57cadfd26e4754efdf89e9e37de87885f9b5c847b2615688ca04adfaf6ca604 -$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages +$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages $(package)_patches=sorted_list.patch define $(package)_preprocess_cmds @@ -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_mac_alias.mk b/depends/packages/native_mac_alias.mk index 05519fc2ed..9d430d9137 100644 --- a/depends/packages/native_mac_alias.mk +++ b/depends/packages/native_mac_alias.mk @@ -3,7 +3,7 @@ $(package)_version=2.2.0 $(package)_download_path=https://github.com/al45tair/mac_alias/archive/ $(package)_file_name=v$($(package)_version).tar.gz $(package)_sha256_hash=421e6d7586d1f155c7db3e7da01ca0dacc9649a509a253ad7077b70174426499 -$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages +$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages define $(package)_preprocess_cmds endef From 423cae6edf510d4e7fea08c57420ab5761024bd7 Mon Sep 17 00:00:00 2001 From: fdov Date: Sun, 28 Nov 2021 15:28:16 +0100 Subject: [PATCH 2/2] contrib: python to python3 --- contrib/devtools/check-doc.py | 2 +- contrib/devtools/clang-format-diff.py | 2 +- contrib/devtools/optimize-pngs.py | 2 +- contrib/devtools/security-check.py | 2 +- contrib/devtools/symbol-check.py | 2 +- contrib/devtools/test-security-check.py | 2 +- contrib/devtools/update-translations.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py index 70d668ecb3..8e25daf5d0 100755 --- a/contrib/devtools/check-doc.py +++ b/contrib/devtools/check-doc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2015-2016 The Bitcoin Core developers # Copyright (c) 2017-2020 The Raven Core developers # Distributed under the MIT software license, see the accompanying diff --git a/contrib/devtools/clang-format-diff.py b/contrib/devtools/clang-format-diff.py index 617ebd75cd..79f07e1861 100755 --- a/contrib/devtools/clang-format-diff.py +++ b/contrib/devtools/clang-format-diff.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===# # diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py index 2ad34c6083..7b9b82daef 100755 --- a/contrib/devtools/optimize-pngs.py +++ b/contrib/devtools/optimize-pngs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014-2016 The Bitcoin Core developers # Copyright (c) 2017-2020 The Raven Core developers # Distributed under the MIT software license, see the accompanying diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py index 2c64007ec0..1f3c9157f9 100755 --- a/contrib/devtools/security-check.py +++ b/contrib/devtools/security-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2015-2016 The Bitcoin Core developers # Copyright (c) 2017-2020 The Raven Core developers # Distributed under the MIT software license, see the accompanying diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index d3b714fc1d..e56998da38 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014 Wladimir J. van der Laan # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py index 8381c0b9a2..6a1d9f5662 100755 --- a/contrib/devtools/test-security-check.py +++ b/contrib/devtools/test-security-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # Copyright (c) 2015-2016 The Bitcoin Core developers # Copyright (c) 2017-2020 The Raven Core developers # Distributed under the MIT software license, see the accompanying diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index e79bdc6b4f..2e8a703f97 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014 Wladimir J. van der Laan # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php.