Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions python-3.10/build_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ QUICK_BUILD=no

if [[ $ppc_arch == "p10" ]]
then
if [[ -z "${GCC_11_HOME}" ]];
if [[ -z "${GCC_HOME}" ]];
then
echo "Please set GCC_11_HOME to the install path of gcc-toolset-11"
echo "Please set GCC_HOME to the install path of gcc-toolset-11"
exit 1
else
CC=${GCC_11_HOME}/bin/gcc
CXX=${GCC_11_HOME}/bin/g++
CC=${GCC_HOME}/bin/gcc
CXX=${GCC_HOME}/bin/g++
GCC=$CC
AR=${GCC_11_HOME}/bin/ar
LD=${GCC_11_HOME}/bin/ld
NM=${GCC_11_HOME}/bin/nm
OBJCOPY=${GCC_11_HOME}/bin/objcopy
OBJDUMP=${GCC_11_HOME}/bin/objdump
RANLIB=${GCC_11_HOME}/bin/ranlib
STRIP=${GCC_11_HOME}/bin/strip
READELF=${GCC_11_HOME}/bin/readelf
AR=${GCC_HOME}/bin/ar
LD=${GCC_HOME}/bin/ld
NM=${GCC_HOME}/bin/nm
OBJCOPY=${GCC_HOME}/bin/objcopy
OBJDUMP=${GCC_HOME}/bin/objdump
RANLIB=${GCC_HOME}/bin/ranlib
STRIP=${GCC_HOME}/bin/strip
READELF=${GCC_HOME}/bin/readelf
HOST=powerpc64le-conda_cos7-linux-gnu
CONDA_BUILD_CROSS_COMPILATION=1
CC_FOR_BUILD=$CC
Expand Down
8 changes: 4 additions & 4 deletions python-3.10/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ source:
build:
number: {{ build_number }}
script_env: # [ppc_arch == "p10"]
- GCC_11_HOME # [ppc_arch == "p10"]
- GCC_HOME # [ppc_arch == "p10"]

requirements:
build:
Expand All @@ -107,7 +107,7 @@ outputs:
build:
number: {{ build_number }}
script_env: # [ppc_arch == "p10"]
- GCC_11_HOME # [ppc_arch == "p10"]
- GCC_HOME # [ppc_arch == "p10"]
activate_in_script: true
# Windows has issues updating python if conda is using files itself.
# Copy rather than link.
Expand Down Expand Up @@ -145,7 +145,7 @@ outputs:
script_env:
- PY_INTERP_LINKAGE_NATURE={{ linkage_nature_env }}
- PY_INTERP_DEBUG={{ py_interp_debug }}
- GCC_11_HOME #[ppc_arch == 'p10']
- GCC_HOME #[ppc_arch == 'p10']
# Putting these here means they get emitted to build_env_setup.{sh,bat} meaning we can launch IDEs
# after sourcing or calling that script without examine the contents of conda_build.{sh,bat} for
# important env. vars.
Expand Down Expand Up @@ -296,7 +296,7 @@ outputs:
build:
number: {{ build_number }}
script_env: # [ppc_arch == "p10"]
- GCC_11_HOME # [ppc_arch == "p10"]
- GCC_HOME # [ppc_arch == "p10"]
activate_in_script: true
{% if 'conda-forge' in channel_targets %}
ignore_run_exports:
Expand Down
26 changes: 13 additions & 13 deletions python-3.10/tests/prefix-replacement/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ set -ex

if [[ $ppc_arch == "p10" ]]
then
if [[ -z "${GCC_11_HOME}" ]];
if [[ -z "${GCC_HOME}" ]];
then
echo "Please set GCC_11_HOME to the install path of gcc-toolset-11"
echo "Please set GCC_HOME to the install path of gcc-toolset-11"
exit 1
else
CC=${GCC_11_HOME}/bin/gcc
CXX=${GCC_11_HOME}/bin/g++
CC=${GCC_HOME}/bin/gcc
CXX=${GCC_HOME}/bin/g++
GCC=$CC
AR=${GCC_11_HOME}/bin/ar
LD=${GCC_11_HOME}/bin/ld
NM=${GCC_11_HOME}/bin/nm
OBJCOPY=${GCC_11_HOME}/bin/objcopy
OBJDUMP=${GCC_11_HOME}/bin/objdump
RANLIB=${GCC_11_HOME}/bin/ranlib
STRIP=${GCC_11_HOME}/bin/strip
READELF=${GCC_11_HOME}/bin/readelf
# export PATH=$GCC_11_HOME/bin:$PATH
AR=${GCC_HOME}/bin/ar
LD=${GCC_HOME}/bin/ld
NM=${GCC_HOME}/bin/nm
OBJCOPY=${GCC_HOME}/bin/objcopy
OBJDUMP=${GCC_HOME}/bin/objdump
RANLIB=${GCC_HOME}/bin/ranlib
STRIP=${GCC_HOME}/bin/strip
READELF=${GCC_HOME}/bin/readelf
# export PATH=$GCC_HOME/bin:$PATH
fi
fi

Expand Down
24 changes: 12 additions & 12 deletions python-3.11/build_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ QUICK_BUILD=no

if [[ $ppc_arch == "p10" ]]
then
if [[ -z "${GCC_11_HOME}" ]];
if [[ -z "${GCC_HOME}" ]];
then
echo "Please set GCC_11_HOME to the install path of gcc-toolset-11"
echo "Please set GCC_HOME to the install path of gcc-toolset-11"
exit 1
else
CC=${GCC_11_HOME}/bin/gcc
CXX=${GCC_11_HOME}/bin/g++
CC=${GCC_HOME}/bin/gcc
CXX=${GCC_HOME}/bin/g++
GCC=$CC
AR=${GCC_11_HOME}/bin/ar
LD=${GCC_11_HOME}/bin/ld
NM=${GCC_11_HOME}/bin/nm
OBJCOPY=${GCC_11_HOME}/bin/objcopy
OBJDUMP=${GCC_11_HOME}/bin/objdump
RANLIB=${GCC_11_HOME}/bin/ranlib
STRIP=${GCC_11_HOME}/bin/strip
READELF=${GCC_11_HOME}/bin/readelf
AR=${GCC_HOME}/bin/ar
LD=${GCC_HOME}/bin/ld
NM=${GCC_HOME}/bin/nm
OBJCOPY=${GCC_HOME}/bin/objcopy
OBJDUMP=${GCC_HOME}/bin/objdump
RANLIB=${GCC_HOME}/bin/ranlib
STRIP=${GCC_HOME}/bin/strip
READELF=${GCC_HOME}/bin/readelf
HOST=powerpc64le-conda_cos7-linux-gnu
CONDA_BUILD_CROSS_COMPILATION=1
CC_FOR_BUILD=$CC
Expand Down
18 changes: 6 additions & 12 deletions python-3.11/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "3.11.5" %}
{% set version = "3.11.8" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
Expand Down Expand Up @@ -44,14 +44,8 @@ package:
version: {{ version }}{{ dev }}

source:
{% if from_source_control == 'yes' %}
- git_url: https://github.com/python/CPython.git
git_tag: v{{ version }}{{ dev }}
{% else %}
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
sha256: 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
{% endif %}
git_tag: v{{ version }}
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
Expand Down Expand Up @@ -92,7 +86,7 @@ source:
build:
number: {{ build_number }}
script_env: # [ppc_arch == "p10"]
- GCC_11_HOME # [ppc_arch == "p10"]
- GCC_HOME # [ppc_arch == "p10"]

requirements:
build:
Expand All @@ -111,7 +105,7 @@ outputs:
build:
number: {{ build_number }}
script_env: # [ppc_arch == "p10"]
- GCC_11_HOME # [ppc_arch == "p10"]
- GCC_HOME # [ppc_arch == "p10"]
activate_in_script: true
# Windows has issues updating python if conda is using files itself.
# Copy rather than link.
Expand Down Expand Up @@ -149,7 +143,7 @@ outputs:
script_env:
- PY_INTERP_LINKAGE_NATURE={{ linkage_nature_env }}
- PY_INTERP_DEBUG={{ py_interp_debug }}
- GCC_11_HOME #[ppc_arch == 'p10']
- GCC_HOME #[ppc_arch == 'p10']
# Putting these here means they get emitted to build_env_setup.{sh,bat} meaning we can launch IDEs
# after sourcing or calling that script without examine the contents of conda_build.{sh,bat} for
# important env. vars.
Expand Down Expand Up @@ -300,7 +294,7 @@ outputs:
build:
number: {{ build_number }}
script_env: # [ppc_arch == "p10"]
- GCC_11_HOME # [ppc_arch == "p10"]
- GCC_HOME # [ppc_arch == "p10"]
activate_in_script: true
{% if 'conda-forge' in channel_targets %}
ignore_run_exports:
Expand Down
Loading