Skip to content

Commit 17e33fb

Browse files
committed
Merge bitcoin#29237: depends: Allow PATH with spaces in directory names.
4756114 [depends] Allow PATH with spaces in directory names. (Mark Friedenbach) Pull request description: The goal of this PR is to help close bitcoin#28733. I reverted the change on `depends/config.guess` based on the feedback provided in the previous PR. I've also incorporated the test mentioned by maflcko ACKs for top commit: maflcko: lgtm ACK 4756114 hebasto: ACK 4756114, successfully built depends on Ubuntu 22.04. TheCharlatan: ACK 4756114 Tree-SHA512: ee257f6efd235839156bc236384f08d77b91debc3c257168368a71e70742639f28a3289572b8693609c1109062dc9968e461103d1f4f5679906506e94b54e649
2 parents 28ccc70 + 4756114 commit 17e33fb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ci/test/02_run_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if [ "$CI_OS_NAME" == "macos" ]; then
7070
fi
7171

7272
CI_EXEC () {
73-
$CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*"
73+
$CI_EXEC_CMD_PREFIX bash -c "export PATH=\"/path_with space:${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH\" && cd \"${BASE_ROOT_DIR}\" && $*"
7474
}
7575
export -f CI_EXEC
7676

depends/funcs.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig
139139
$(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig
140140
$(1)_config_env+=PKG_CONFIG_SYSROOT_DIR=/
141141
$(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake
142-
$(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH)
143-
$(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH)
144-
$(1)_stage_env+=PATH=$(build_prefix)/bin:$(PATH)
142+
$(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)"
143+
$(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)"
144+
$(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)"
145145

146146
# Setting a --build type that differs from --host will explicitly enable
147147
# cross-compilation mode. Note that --build defaults to the output of

0 commit comments

Comments
 (0)