Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable support for s390x in conda-build #3949

Merged
merged 4 commits into from
Jun 17, 2020
Merged

Enable support for s390x in conda-build #3949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47067ed
Enable support for s390x in conda-build
pradghos May 11, 2020
772ac42
File name change to s390x-support
pradghos May 11, 2020
2578d84
Addressed review comments
pradghos Jun 9, 2020
7451e85
Minor fix
pradghos Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conda_build/cli/main_convert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def parse_args(args):
'-p', "--platform",
dest='platforms',
action="append",
choices=['osx-64', 'linux-32', 'linux-64', 'linux-ppc64',
'linux-ppc64le', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64',
choices=['osx-64', 'linux-32', 'linux-64', 'linux-ppc64', 'linux-ppc64le',
'linux-s390x', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64',
'win-32', 'win-64', 'all'],
help="Platform to convert the packages to.",
default=None
Expand Down
7 changes: 4 additions & 3 deletions conda_build/convert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ def update_index_file(temp_dir, target_platform, dependencies, verbose):
index = json.load(file)

platform, architecture = target_platform.split('-')
other_platforms = ['linux-ppc64', 'linux-ppc64le', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64']
other_platforms = ['linux-ppc64', 'linux-ppc64le', 'linux-s390x',
'linux-armv6l', 'linux-armv7l', 'linux-aarch64']

if target_platform in other_platforms:
source_architecture = architecture
Expand Down Expand Up @@ -763,8 +764,8 @@ def conda_convert(file_path, output_dir=".", show_imports=False, platforms=None,
source_platform_architecture = '{}-{}' .format(source_platform, architecture)

if 'all' in platforms:
platforms = ['osx-64', 'linux-32', 'linux-64', 'linux-ppc64',
'linux-ppc64le', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64',
platforms = ['osx-64', 'linux-32', 'linux-64', 'linux-ppc64', 'linux-ppc64le',
'linux-s390x', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64',
'win-32', 'win-64']

for platform in platforms:
Expand Down
2 changes: 1 addition & 1 deletion conda_build/jinja_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ def cdt(package_name, config, permit_undefined_jinja=False):

cdt_name = 'cos6'
arch = config.host_arch or config.arch
if arch == 'ppc64le' or arch == 'aarch64' or arch == 'ppc64':
if arch == 'ppc64le' or arch == 'aarch64' or arch == 'ppc64' or arch == 's390x':
cdt_name = 'cos7'
cdt_arch = arch
else:
Expand Down
1 change: 1 addition & 0 deletions conda_build/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def glob(pathname, recursive=True):
DEFAULT_SUBDIRS = {
"linux-64",
"linux-32",
"linux-s390x",
"linux-ppc64",
"linux-ppc64le",
"linux-armv6l",
Expand Down
25 changes: 25 additions & 0 deletions news/s390x-support.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Enhancements:
-------------

* <news item>

Bug fixes:
----------

* <news item>

Deprecations:
-------------

* <news item>

Docs:
-----

* <news item>

Other:
------

* Enable s390x support