Skip to content

Commit 729f797

Browse files
committed
Hopefully fix unzip and some other things
1 parent 212d991 commit 729f797

File tree

5 files changed

+51
-60
lines changed

5 files changed

+51
-60
lines changed

recipe/build-core.sh

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,25 @@ build --define CONDA_AR=${AR}
2525
build --define CONDA_NM=${NM}
2626
build --define CONDA_RANLIB=${RANLIB}
2727
build --define CONDA_SDKROOT=${SDKROOT}
28-
# build --subcommands
28+
EOF
29+
fi
30+
31+
export LDFLAGS="${LDFLAGS} -lm"
32+
source gen-bazel-toolchain
33+
cat >> .bazelrc <<EOF
2934
build --crosstool_top=//bazel_toolchain:toolchain
30-
build --cpu=${TARGET_CPU}
3135
build --platforms=//bazel_toolchain:target_platform
3236
build --host_platform=//bazel_toolchain:build_platform
33-
build --experimental_ui_max_stdouterr_bytes=16000000
34-
build --local_ram_resources=HOST_RAM*.8 --local_cpu_resources=2
37+
build --extra_toolchains=//bazel_toolchain:cc_cf_toolchain
38+
build --extra_toolchains=//bazel_toolchain:cc_cf_host_toolchain
39+
build --logging=6
40+
build --verbose_failures
41+
build --toolchain_resolution_debug
42+
build --local_cpu_resources=${CPU_COUNT}
3543
EOF
36-
else
37-
# set UNZIP, https://github.com/conda-forge/docker-images/issues/311
38-
export UNZIP=$(which unzip)
44+
45+
if [[ "${target_platform}" == "osx-arm64" || "${target_platform}" != "${build_platform}" ]]; then
46+
echo "build --cpu=${TARGET_CPU}" >> .bazelrc
3947
fi
4048

4149
echo '---------------- .bazelrc --------------------------'

recipe/patches/0008-patch-zlib-in-prometheus-cpp-and-boost.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ index 0000000000..77c766c1b0
5050
--- /dev/null
5151
+++ b/thirdparty/patches/boost-mirrors.patch
5252
@@ -0,0 +1,13 @@
53-
+diff --git boost/boost.bzl boost/boost.bzl
53+
+diff --git a/boost/boost.bzl b/boost/boost.bzl
5454
+index fc56a14..e54c4e7 100644
55-
+--- boost/boost.bzl
56-
++++ boost/boost.bzl
55+
+--- a/boost/boost.bzl
56+
++++ b/boost/boost.bzl
5757
+@@ -178,7 +178,7 @@ def boost_deps():
5858
+ ]
5959
+ )
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From a3e8904c2168c075d1bc2a7abf8f94e08d4b83a6 Mon Sep 17 00:00:00 2001
2+
From: Austin Morton <austin.morton@aquatic.com>
3+
Date: Mon, 1 Sep 2025 11:21:43 -0500
4+
Subject: [PATCH] No path isolation
5+
6+
---
7+
python/setup.py | 7 -------
8+
1 file changed, 7 deletions(-)
9+
10+
diff --git a/python/setup.py b/python/setup.py
11+
index 82a08fda81..15b07b3660 100644
12+
--- a/python/setup.py
13+
+++ b/python/setup.py
14+
@@ -634,13 +634,6 @@ def build(build_python, build_java, build_cpp):
15+
bazel_precmd_flags = []
16+
if sys.platform == "win32":
17+
bazel_precmd_flags = ["--output_user_root=C:/tmp"]
18+
- # Using --incompatible_strict_action_env so that the build is more
19+
- # cache-able We cannot turn this on for Python tests yet, as Ray's
20+
- # Python bazel tests are not hermetic.
21+
- #
22+
- # And we put it here so that does not change behavior of
23+
- # conda-forge build.
24+
- bazel_flags.append("--incompatible_strict_action_env")
25+
26+
bazel_targets = []
27+
bazel_targets += ["//:gen_ray_pkg"] if build_python else []
28+
--
29+
2.43.0
30+

recipe/patches/0012-use-unzip-from-env.patch

Lines changed: 0 additions & 47 deletions
This file was deleted.

recipe/recipe.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ source:
3131
- patches/0010-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch
3232
# Avoid building openssl-1.1.1f and redis, not needed in the shipped package
3333
- patches/0011-do-not-build-redis-openssl.patch
34-
# https://github.com/conda-forge/docker-images/issues/311
35-
- patches/0012-use-unzip-from-env.patch # [linux]
34+
# Turns off --incompatible_strict_action_env
35+
- patches/0012-No-path-isolation.patch
3636

3737
build:
3838
number: 0
@@ -92,6 +92,7 @@ outputs:
9292
- psutil
9393
- python
9494
- setproctitle >=1.2.2,<1.4
95+
- unzip
9596
- if: build_platform != target_platform
9697
then: cross-python_${{ target_platform }}
9798
host:
@@ -115,7 +116,6 @@ outputs:
115116
- psutil
116117
- pyyaml
117118
- requests
118-
- setproctitle >=1.2.2,<1.4
119119
tests:
120120
- python:
121121
imports:

0 commit comments

Comments
 (0)