diff options
| author | fanquake <fanquake@gmail.com> | 2024-01-15 13:14:17 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-01-15 13:14:32 +0000 |
| commit | 17e33fb57842e4080e6768c074654bd1fd7f8696 (patch) | |
| tree | 32773de9abf4ea730ba143a5a3898f980a32aabf | |
| parent | 28ccc7003a4c3f198a255d6f55f5748d4fd8fd1a (diff) | |
| parent | 4756114e505cff8848fb6344ef9a48d8822066c1 (diff) | |
| download | bitcoin-17e33fb57842e4080e6768c074654bd1fd7f8696.tar.xz | |
Merge bitcoin/bitcoin#29237: depends: Allow PATH with spaces in directory names.
4756114e505cff8848fb6344ef9a48d8822066c1 [depends] Allow PATH with spaces in directory names. (Mark Friedenbach)
Pull request description:
The goal of this PR is to help close https://github.com/bitcoin/bitcoin/pull/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 4756114e505cff8848fb6344ef9a48d8822066c1
hebasto:
ACK 4756114e505cff8848fb6344ef9a48d8822066c1, successfully built depends on Ubuntu 22.04.
TheCharlatan:
ACK 4756114e505cff8848fb6344ef9a48d8822066c1
Tree-SHA512: ee257f6efd235839156bc236384f08d77b91debc3c257168368a71e70742639f28a3289572b8693609c1109062dc9968e461103d1f4f5679906506e94b54e649
| -rwxr-xr-x | ci/test/02_run_container.sh | 2 | ||||
| -rw-r--r-- | depends/funcs.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index 64b1e4e182..8a7a978994 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -70,7 +70,7 @@ if [ "$CI_OS_NAME" == "macos" ]; then fi CI_EXEC () { - $CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*" + $CI_EXEC_CMD_PREFIX bash -c "export PATH=\"/path_with space:${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH\" && cd \"${BASE_ROOT_DIR}\" && $*" } export -f CI_EXEC diff --git a/depends/funcs.mk b/depends/funcs.mk index 987be4e611..ce87aa579f 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -139,9 +139,9 @@ $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig $(1)_config_env+=PKG_CONFIG_SYSROOT_DIR=/ $(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake -$(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH) -$(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH) -$(1)_stage_env+=PATH=$(build_prefix)/bin:$(PATH) +$(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)" +$(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)" +$(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)" # Setting a --build type that differs from --host will explicitly enable # cross-compilation mode. Note that --build defaults to the output of |