Skip to content

Commit fa0f92a

Browse files
author
MarcoFalke
committed
build: depends: Switch to python3
1 parent 887f57e commit fa0f92a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
name: 'macOS 10.10 [GOAL: deploy] [no functional tests]'
159159
env: >-
160160
HOST=x86_64-apple-darwin14
161-
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools-git"
161+
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools"
162162
OSX_SDK=10.11
163163
RUN_UNIT_TESTS=false
164164
RUN_FUNCTIONAL_TESTS=false

‎depends/config.site.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767
if test -n "@CXX@" -a -z "${CXX}"; then
6868
CXX="@CXX@"
6969
fi
70-
PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
70+
PYTHONPATH=$depends_prefix/native/lib/python3/dist-packages:$PYTHONPATH
7171

7272
if test -n "@AR@"; then
7373
AR=@AR@

‎depends/packages/native_biplist.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ $(package)_version=1.0.3
33
$(package)_download_path=https://bitbucket.org/wooster/biplist/downloads
44
$(package)_file_name=biplist-$($(package)_version).tar.gz
55
$(package)_sha256_hash=4c0549764c5fe50b28042ec21aa2e14fe1a2224e239a1dae77d9e7f3932aa4c6
6-
$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
6+
$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages
77

88
define $(package)_build_cmds
9-
python setup.py build
9+
python3 setup.py build
1010
endef
1111

1212
define $(package)_stage_cmds
1313
mkdir -p $($(package)_install_libdir) && \
14-
python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
14+
python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
1515
endef

‎depends/packages/native_ds_store.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ $(package)_version=1.1.2
33
$(package)_download_path=https://github.com/al45tair/ds_store/archive/
44
$(package)_file_name=v$($(package)_version).tar.gz
55
$(package)_sha256_hash=3b3ecb7bf0a5157f5b6010bc3af7c141fb0ad3527084e63336220d22744bc20c
6-
$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
6+
$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages
77
$(package)_dependencies=native_biplist
88

99
define $(package)_build_cmds
10-
python setup.py build
10+
python3 setup.py build
1111
endef
1212

1313
define $(package)_stage_cmds
1414
mkdir -p $($(package)_install_libdir) && \
15-
python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
15+
python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
1616
endef

‎depends/packages/native_mac_alias.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ $(package)_version=2.0.7
33
$(package)_download_path=https://github.com/al45tair/mac_alias/archive/
44
$(package)_file_name=v$($(package)_version).tar.gz
55
$(package)_sha256_hash=6f606d3b6bccd2112aeabf1a063f5b5ece87005a5d7e97c8faca23b916e88838
6-
$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
6+
$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages
77

88
define $(package)_build_cmds
9-
python setup.py build
9+
python3 setup.py build
1010
endef
1111

1212
define $(package)_stage_cmds
1313
mkdir -p $($(package)_install_libdir) && \
14-
python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
14+
python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
1515
endef

0 commit comments

Comments
 (0)